From: tb <tb@openbsd.org>
Date: Tue, 25 Apr 2023 15:30:03 +0000 (+0000)
Subject: bn_primes: the NIST primes will go away, so remove their tests
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=472a54ea59ddef54c0ec79bcc032e3253f2b4d50;p=openbsd

bn_primes: the NIST primes will go away, so remove their tests
---

diff --git a/regress/lib/libcrypto/bn/bn_primes.c b/regress/lib/libcrypto/bn/bn_primes.c
index cd552dc3ac7..8180b0d78a0 100644
--- a/regress/lib/libcrypto/bn/bn_primes.c
+++ b/regress/lib/libcrypto/bn/bn_primes.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bn_primes.c,v 1.2 2022/12/06 18:23:29 tb Exp $ */
+/*	$OpenBSD: bn_primes.c,v 1.3 2023/04/25 15:30:03 tb Exp $ */
 /*
  * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
  *
@@ -98,19 +98,6 @@ static const struct test_dynamic_api {
 
 #define N_DYNAMIC_TESTS (sizeof(dynamic_api_data) / sizeof(dynamic_api_data[0]))
 
-static const struct test_const_api {
-	const BIGNUM *(*fn)(void);
-	const char *name;
-} const_api_data[] = {
-	BN_PRIME_FN_INIT(BN_get0_nist_prime_192),
-	BN_PRIME_FN_INIT(BN_get0_nist_prime_224),
-	BN_PRIME_FN_INIT(BN_get0_nist_prime_256),
-	BN_PRIME_FN_INIT(BN_get0_nist_prime_384),
-	BN_PRIME_FN_INIT(BN_get0_nist_prime_521),
-};
-
-#define N_CONST_TESTS (sizeof(const_api_data) / sizeof(const_api_data[0]))
-
 static int
 test_prime_dynamic_api(const struct test_dynamic_api *tc)
 {
@@ -136,30 +123,6 @@ test_prime_dynamic_api(const struct test_dynamic_api *tc)
 	return failed;
 }
 
-static int
-test_prime_const_api(const struct test_const_api *tc)
-{
-	const BIGNUM *prime;
-	int ret;
-	int failed = 1;
-
-	if ((prime = tc->fn()) == NULL) {
-		fprintf(stderr, "%s failed\n", tc->name);
-		goto err;
-	}
-
-	if ((ret = BN_is_prime_fasttest_ex(prime, 1, NULL, 1, NULL)) != 1) {
-		fprintf(stderr, "%s: %s: want 1, got %d\n", tc->name,
-		    "BN_is_prime_fasttest_ex", ret);
-		goto err;
-	}
-
-	failed = 0;
-
- err:
-	return failed;
-}
-
 static int
 test_prime_constants(void)
 {
@@ -169,9 +132,6 @@ test_prime_constants(void)
 	for (i = 0; i < N_DYNAMIC_TESTS; i++)
 		failed |= test_prime_dynamic_api(&dynamic_api_data[i]);
 
-	for (i = 0; i < N_CONST_TESTS; i++)
-		failed |= test_prime_const_api(&const_api_data[i]);
-
 	return failed;
 }