diff options
| author | tb <> | 2026-01-23 08:31:20 +0000 |
|---|---|---|
| committer | tb <> | 2026-01-23 08:31:20 +0000 |
| commit | 876d7353d09383178d78440641be18fef7ddfe00 (patch) | |
| tree | 35703d6d1b4b0761a135e274d494b83e2f1ea7e6 /src | |
| parent | 87d5ceb7c77925e0cffb6fb9e902a9c722af86c9 (diff) | |
| download | openbsd-876d7353d09383178d78440641be18fef7ddfe00.tar.gz openbsd-876d7353d09383178d78440641be18fef7ddfe00.tar.bz2 openbsd-876d7353d09383178d78440641be18fef7ddfe00.zip | |
bn_ffdh: unifdef HAVE_RFC7919_PRIMES
Diffstat (limited to 'src')
| -rw-r--r-- | src/regress/lib/libcrypto/bn/bn_ffdh.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/regress/lib/libcrypto/bn/bn_ffdh.c b/src/regress/lib/libcrypto/bn/bn_ffdh.c index 37dfe94278..b67b3674ee 100644 --- a/src/regress/lib/libcrypto/bn/bn_ffdh.c +++ b/src/regress/lib/libcrypto/bn/bn_ffdh.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bn_ffdh.c,v 1.1 2026/01/23 07:24:48 tb Exp $ */ | 1 | /* $OpenBSD: bn_ffdh.c,v 1.2 2026/01/23 08:31:20 tb Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 2026 Theo Buehler <tb@openbsd.org> | 4 | * Copyright (c) 2026 Theo Buehler <tb@openbsd.org> |
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include "bn_local.h" | 25 | #include "bn_local.h" |
| 26 | 26 | ||
| 27 | #define HAVE_RFC7919_PRIMES 0 | ||
| 28 | #define HAVE_SCAPY_SPECIAL 0 | 27 | #define HAVE_SCAPY_SPECIAL 0 |
| 29 | 28 | ||
| 30 | /* | 29 | /* |
| @@ -191,8 +190,6 @@ static const char *rfc3526_prime_8192 = | |||
| 191 | "60C980DD" "98EDD3DF" "FFFFFFFF" "FFFFFFFF" | 190 | "60C980DD" "98EDD3DF" "FFFFFFFF" "FFFFFFFF" |
| 192 | ; | 191 | ; |
| 193 | 192 | ||
| 194 | #if HAVE_RFC7919_PRIMES | ||
| 195 | |||
| 196 | static const char *rfc7919_prime_2048 = | 193 | static const char *rfc7919_prime_2048 = |
| 197 | "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1" | 194 | "FFFFFFFF" "FFFFFFFF" "ADF85458" "A2BB4A9A" "AFDC5620" "273D3CF1" |
| 198 | "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9" | 195 | "D8B9C583" "CE2D3695" "A9E13641" "146433FB" "CC939DCE" "249B3EF9" |
| @@ -327,8 +324,6 @@ static const char *rfc7919_prime_8192 = | |||
| 327 | "97D11D49" "F7A8443D" "0822E506" "A9F4614E" "011E2A94" "838FF88C" | 324 | "97D11D49" "F7A8443D" "0822E506" "A9F4614E" "011E2A94" "838FF88C" |
| 328 | "D68C8BB7" "C5C6424C" "FFFFFFFF" "FFFFFFFF"; | 325 | "D68C8BB7" "C5C6424C" "FFFFFFFF" "FFFFFFFF"; |
| 329 | 326 | ||
| 330 | #endif /* HAVE_RFC7919_PRIMES */ | ||
| 331 | |||
| 332 | typedef BIGNUM *(*get_p_fn)(BIGNUM *); | 327 | typedef BIGNUM *(*get_p_fn)(BIGNUM *); |
| 333 | 328 | ||
| 334 | static const struct ffdh_test { | 329 | static const struct ffdh_test { |
| @@ -376,7 +371,6 @@ static const struct ffdh_test { | |||
| 376 | .str = &rfc3526_prime_8192, | 371 | .str = &rfc3526_prime_8192, |
| 377 | .fn = BN_get_rfc3526_prime_8192, | 372 | .fn = BN_get_rfc3526_prime_8192, |
| 378 | }, | 373 | }, |
| 379 | #if HAVE_RFC7919_PRIMES | ||
| 380 | { | 374 | { |
| 381 | .name = "RFC 7919, 2048 bit", | 375 | .name = "RFC 7919, 2048 bit", |
| 382 | .str = &rfc7919_prime_2048, | 376 | .str = &rfc7919_prime_2048, |
| @@ -402,7 +396,6 @@ static const struct ffdh_test { | |||
| 402 | .str = &rfc7919_prime_8192, | 396 | .str = &rfc7919_prime_8192, |
| 403 | .fn = BN_get_rfc7919_prime_8192, | 397 | .fn = BN_get_rfc7919_prime_8192, |
| 404 | }, | 398 | }, |
| 405 | #endif /* HAVE_RFC7919_PRIMES */ | ||
| 406 | }; | 399 | }; |
| 407 | 400 | ||
| 408 | #define N_TESTS (sizeof(ffdh_tests) / sizeof(ffdh_tests[0])) | 401 | #define N_TESTS (sizeof(ffdh_tests) / sizeof(ffdh_tests[0])) |
