diff options
Diffstat (limited to 'src/regress/lib/libcrypto/ec/ec_asn1_test.c')
-rw-r--r-- | src/regress/lib/libcrypto/ec/ec_asn1_test.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/regress/lib/libcrypto/ec/ec_asn1_test.c b/src/regress/lib/libcrypto/ec/ec_asn1_test.c index 646350b834..86f694b848 100644 --- a/src/regress/lib/libcrypto/ec/ec_asn1_test.c +++ b/src/regress/lib/libcrypto/ec/ec_asn1_test.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_asn1_test.c,v 1.11 2024/10/18 17:29:24 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1_test.c,v 1.12 2024/10/18 19:55:34 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2017, 2021 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2017, 2021 Joel Sing <jsing@openbsd.org> |
4 | * Copyright (c) 2024 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2024 Theo Buehler <tb@openbsd.org> |
@@ -117,7 +117,7 @@ compare_data(const char *label, const unsigned char *d1, size_t d1_len, | |||
117 | return -1; | 117 | return -1; |
118 | } | 118 | } |
119 | if (memcmp(d1, d2, d1_len) != 0) { | 119 | if (memcmp(d1, d2, d1_len) != 0) { |
120 | fprintf(stderr, "FAIL: %sdiffer\n", label); | 120 | fprintf(stderr, "FAIL: %s differ\n", label); |
121 | fprintf(stderr, "got:\n"); | 121 | fprintf(stderr, "got:\n"); |
122 | hexdump(d1, d1_len); | 122 | hexdump(d1, d1_len); |
123 | fprintf(stderr, "want:\n"); | 123 | fprintf(stderr, "want:\n"); |
@@ -288,10 +288,16 @@ ec_group_roundtrip_builtin_curve(const EC_builtin_curve *curve) | |||
288 | { | 288 | { |
289 | EC_GROUP *group = NULL; | 289 | EC_GROUP *group = NULL; |
290 | int failed = 0; | 290 | int failed = 0; |
291 | int ret = 0; | ||
291 | 292 | ||
292 | if ((group = EC_GROUP_new_by_curve_name(curve->nid)) == NULL) | 293 | if ((group = EC_GROUP_new_by_curve_name(curve->nid)) == NULL) |
293 | errx(1, "failed to instantiate curve %d", curve->nid); | 294 | errx(1, "failed to instantiate curve %d", curve->nid); |
294 | 295 | ||
296 | if (!EC_GROUP_check(group, NULL)) { | ||
297 | fprintf(stderr, "FAIL: EC_GROUP_check(%d) failed\n", curve->nid); | ||
298 | goto err; | ||
299 | } | ||
300 | |||
295 | if (EC_GROUP_get_asn1_flag(group) != OPENSSL_EC_NAMED_CURVE) { | 301 | if (EC_GROUP_get_asn1_flag(group) != OPENSSL_EC_NAMED_CURVE) { |
296 | fprintf(stderr, "FAIL: ASN.1 flag not set for %d\n", curve->nid); | 302 | fprintf(stderr, "FAIL: ASN.1 flag not set for %d\n", curve->nid); |
297 | goto err; | 303 | goto err; |
@@ -314,7 +320,11 @@ ec_group_roundtrip_builtin_curve(const EC_builtin_curve *curve) | |||
314 | EC_GROUP_set_point_conversion_form(group, POINT_CONVERSION_HYBRID); | 320 | EC_GROUP_set_point_conversion_form(group, POINT_CONVERSION_HYBRID); |
315 | failed |= ec_group_roundtrip_curve(group, "hybrid", curve->nid); | 321 | failed |= ec_group_roundtrip_curve(group, "hybrid", curve->nid); |
316 | 322 | ||
323 | ret = 1; | ||
324 | |||
317 | err: | 325 | err: |
326 | failed |= ret == 0; | ||
327 | |||
318 | EC_GROUP_free(group); | 328 | EC_GROUP_free(group); |
319 | 329 | ||
320 | return failed; | 330 | return failed; |