diff options
| author | Benjamin Kaduk <bkaduk@akamai.com> | 2021-03-16 20:13:47 -0700 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2021-05-15 15:09:07 -0700 |
| commit | f89d3d698c570703b7fc0908603faf61f6f68446 (patch) | |
| tree | 6139350445fd4756eb61c693ee267f6b97c25261 | |
| parent | 75d4852090bb898b39be8e7ae2874720bd0a9c5c (diff) | |
move group lists out of test_key_exchange() in preparation for reuse
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14750)
| -rw-r--r-- | test/sslapitest.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/sslapitest.c b/test/sslapitest.c index 7ed0d597cd..3a032aaaa5 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -4487,19 +4487,19 @@ static int test_ciphersuite_change(void) * Test 12 = Test all ECDHE with TLSv1.2 client and server * Test 13 = Test all FFDHE with TLSv1.2 client and server */ +# ifndef OPENSSL_NO_EC +static int ecdhe_kexch_groups[] = {NID_X9_62_prime256v1, NID_secp384r1, + NID_secp521r1, NID_X25519, NID_X448}; +# endif +# ifndef OPENSSL_NO_DH +static int ffdhe_kexch_groups[] = {NID_ffdhe2048, NID_ffdhe3072, NID_ffdhe4096, + NID_ffdhe6144, NID_ffdhe8192}; +# endif static int test_key_exchange(int idx) { SSL_CTX *sctx = NULL, *cctx = NULL; SSL *serverssl = NULL, *clientssl = NULL; int testresult = 0; -# ifndef OPENSSL_NO_EC - int ecdhe_kexch_groups[] = {NID_X9_62_prime256v1, NID_secp384r1, - NID_secp521r1, NID_X25519, NID_X448}; -# endif -# ifndef OPENSSL_NO_DH - int ffdhe_kexch_groups[] = {NID_ffdhe2048, NID_ffdhe3072, NID_ffdhe4096, - NID_ffdhe6144, NID_ffdhe8192}; -# endif int kexch_alg; int *kexch_groups = &kexch_alg; int kexch_groups_size = 1; |