diff options
author | tb <> | 2023-04-26 09:31:12 +0000 |
---|---|---|
committer | tb <> | 2023-04-26 09:31:12 +0000 |
commit | 1f0e06ee4a973473f7ae0f571f87db2d6c23f5dd (patch) | |
tree | 60d0a2ef69123757123eb6d370362ce43e798974 /src/regress/lib/libcrypto/ec | |
parent | b26d42117a508c2f1f39920ac3299c79d80ee9b5 (diff) | |
download | openbsd-1f0e06ee4a973473f7ae0f571f87db2d6c23f5dd.tar.gz openbsd-1f0e06ee4a973473f7ae0f571f87db2d6c23f5dd.tar.bz2 openbsd-1f0e06ee4a973473f7ae0f571f87db2d6c23f5dd.zip |
Some more EC2M cleanup
Diffstat (limited to 'src/regress/lib/libcrypto/ec')
-rw-r--r-- | src/regress/lib/libcrypto/ec/ec_point_conversion.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/regress/lib/libcrypto/ec/ec_point_conversion.c b/src/regress/lib/libcrypto/ec/ec_point_conversion.c index 398f868615..e65e686da7 100644 --- a/src/regress/lib/libcrypto/ec/ec_point_conversion.c +++ b/src/regress/lib/libcrypto/ec/ec_point_conversion.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_point_conversion.c,v 1.12 2023/04/18 08:05:18 tb Exp $ */ | 1 | /* $OpenBSD: ec_point_conversion.c,v 1.13 2023/04/26 09:31:12 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2021 Theo Buehler <tb@openbsd.org> | 3 | * Copyright (c) 2021 Theo Buehler <tb@openbsd.org> |
4 | * Copyright (c) 2021 Joel Sing <jsing@openbsd.org> | 4 | * Copyright (c) 2021 Joel Sing <jsing@openbsd.org> |
@@ -118,23 +118,12 @@ test_random_points_on_curve(EC_builtin_curve *curve) | |||
118 | BIGNUM *order = NULL; | 118 | BIGNUM *order = NULL; |
119 | BIGNUM *random; | 119 | BIGNUM *random; |
120 | BIGNUM *x, *y; | 120 | BIGNUM *x, *y; |
121 | const char *curve_name; | ||
122 | size_t i, j; | 121 | size_t i, j; |
123 | int failed = 0; | 122 | int failed = 0; |
124 | 123 | ||
125 | curve_name = OBJ_nid2sn(curve->nid); | ||
126 | if ((group = EC_GROUP_new_by_curve_name(curve->nid)) == NULL) | 124 | if ((group = EC_GROUP_new_by_curve_name(curve->nid)) == NULL) |
127 | errx(1, "EC_GROUP_new_by_curve_name(%s)", curve_name); | 125 | errx(1, "EC_GROUP_new_by_curve_name(%s)", |
128 | 126 | OBJ_nid2sn(curve->nid)); | |
129 | #ifndef OPENSSL_NO_EC2M | ||
130 | if (EC_GROUP_get_basis_type(group)) { | ||
131 | EC_GROUP_free(group); | ||
132 | fprintf(stderr, "%s ... skipped\n", curve_name); | ||
133 | return 0; | ||
134 | } | ||
135 | #endif | ||
136 | |||
137 | fprintf(stderr, "%s\n", curve_name); | ||
138 | 127 | ||
139 | if ((order = BN_new()) == NULL) | 128 | if ((order = BN_new()) == NULL) |
140 | errx(1, "BN_new order"); | 129 | errx(1, "BN_new order"); |