Commit 04f80910c9 for openssl.org
commit 04f80910c9167c51bfb16240f79d1b74eefb976d
Author: Viktor Dukhovni <viktor@openssl.org>
Date: Fri Sep 4 20:16:17 2026 +1000
More accurate ssl_new curve tests
- Prefer negotiated group value over tmp pkey type heuristic
- Drop no longer needed brainpool NID workaround.
- Test 14-curves.cnf unless both "ec" and "dh" are disabled.
- Expect specific FFDHE group with TLS 1.3
- Specify "DHE" ciphers when testing FFDHE groups with TLS 1.2
- Test ML-KEM-512 hybrids in FIPS mode after version bump to 4.2
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
MergeDate: Mon Sep 21 11:52:07 2026
(Merged from https://github.com/openssl/openssl/pull/32670)
diff --git a/test/generate_ssl_tests.pl b/test/generate_ssl_tests.pl
index f1c8027fb8..2d9676d736 100644
--- a/test/generate_ssl_tests.pl
+++ b/test/generate_ssl_tests.pl
@@ -140,6 +140,7 @@ sub read_config {
my $fips_mode = $provider eq "fips";
local $ssltests::fips_3_4 = 0;
local $ssltests::fips_3_5 = 0;
+ local $ssltests::fips_4_2 = 0;
if ($fips_mode) {
my $provconf = srctop_file("test", "fips-and-base.cnf");
@@ -148,9 +149,14 @@ sub read_config {
run(test(["fips_version_test", "-config", $provconf, ">=3.4.0"]),
capture => 1, statusvar => \$exit);
$ssltests::fips_3_4 = $exit;
+
run(test(["fips_version_test", "-config", $provconf, ">=3.5.0"]),
capture => 1, statusvar => \$exit);
$ssltests::fips_3_5 = $exit;
+
+ run(test(["fips_version_test", "-config", $provconf, ">=4.2.0"]),
+ capture => 1, statusvar => \$exit);
+ $ssltests::fips_4_2 = $exit;
}
local $ssltests::fips_mode = $fips_mode;
diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c
index 6f7f7f9d21..a974aeab01 100644
--- a/test/helpers/handshake.c
+++ b/test/helpers/handshake.c
@@ -1816,13 +1816,13 @@ err:
*serv_sess_out = SSL_SESSION_dup(tmp);
}
- if (SSL_get_peer_tmp_key(client.ssl, &tmp_key)) {
+ ret->tmp_key_type = SSL_get_negotiated_group(client.ssl);
+ if (ret->tmp_key_type == NID_undef
+ && SSL_get_peer_tmp_key(client.ssl, &tmp_key)) {
ret->tmp_key_type = pkey_type(tmp_key);
EVP_PKEY_free(tmp_key);
if (ret->tmp_key_type == EVP_PKEY_KEYMGMT)
ret->tmp_key_type = SSL_get_negotiated_group(client.ssl);
- } else {
- ret->tmp_key_type = SSL_get_negotiated_group(client.ssl);
}
SSL_get_peer_signature_nid(client.ssl, &ret->server_sign_hash);
diff --git a/test/helpers/ssl_test_ctx.c b/test/helpers/ssl_test_ctx.c
index a65cfe4259..0997f93a0d 100644
--- a/test/helpers/ssl_test_ctx.c
+++ b/test/helpers/ssl_test_ctx.c
@@ -566,17 +566,6 @@ __owur static int parse_expected_key_type(int *ptype, const char *value)
if (nid == NID_undef)
nid = EC_curve_nist2nid(value);
#endif
- switch (nid) {
- case NID_brainpoolP256r1tls13:
- nid = NID_brainpoolP256r1;
- break;
- case NID_brainpoolP384r1tls13:
- nid = NID_brainpoolP384r1;
- break;
- case NID_brainpoolP512r1tls13:
- nid = NID_brainpoolP512r1;
- break;
- }
if (nid == NID_undef)
return 0;
*ptype = nid;
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index b039f9197d..43a0bdf15b 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -120,8 +120,7 @@ my %skip = (
# special-casing for.
# TODO(TLS 1.3): We should review this once we have TLS 1.3.
"13-fragmentation.cnf" => disabled("tls1_2"),
- "14-curves.cnf" => disabled("tls1_2") || disabled("tls1_3")
- || $no_ec2m || $no_ecx || $no_dh,
+ "14-curves.cnf" => disabled("tls1_2") || disabled("tls1_3") || ($no_ec && $no_dh),
"15-certstatus.cnf" => $no_tls || $no_ocsp,
"16-dtls-certstatus.cnf" => $no_dtls || $no_ocsp,
"17-renegotiate.cnf" => $no_tls_below1_3,
diff --git a/test/ssl-tests/14-curves.cnf b/test/ssl-tests/14-curves.cnf
index 71977ae32e..1abfd62503 100644
--- a/test/ssl-tests/14-curves.cnf
+++ b/test/ssl-tests/14-curves.cnf
@@ -22,90 +22,90 @@ test-16 = 16-curve-curveSM2
test-17 = 17-curve-curveSM2MLKEM768
test-18 = 18-curve-MLKEM512X25519
test-19 = 19-curve-SecP256r1MLKEM512
-test-20 = 20-curve-sect233k1
-test-21 = 21-curve-sect233r1
-test-22 = 22-curve-sect283k1
-test-23 = 23-curve-sect283r1
-test-24 = 24-curve-sect409k1
-test-25 = 25-curve-sect409r1
-test-26 = 26-curve-sect571k1
-test-27 = 27-curve-sect571r1
-test-28 = 28-curve-secp224r1
-test-29 = 29-curve-sect163k1
-test-30 = 30-curve-sect163r2
-test-31 = 31-curve-prime192v1
-test-32 = 32-curve-sect163r1
-test-33 = 33-curve-sect193r1
-test-34 = 34-curve-sect193r2
-test-35 = 35-curve-sect239k1
-test-36 = 36-curve-secp160k1
-test-37 = 37-curve-secp160r1
-test-38 = 38-curve-secp160r2
-test-39 = 39-curve-secp192k1
-test-40 = 40-curve-secp224k1
-test-41 = 41-curve-secp256k1
-test-42 = 42-curve-brainpoolP256r1
-test-43 = 43-curve-brainpoolP384r1
-test-44 = 44-curve-brainpoolP512r1
-test-45 = 45-curve-sect233k1-tls12-in-tls13
-test-46 = 46-curve-sect233r1-tls12-in-tls13
-test-47 = 47-curve-sect283k1-tls12-in-tls13
-test-48 = 48-curve-sect283r1-tls12-in-tls13
-test-49 = 49-curve-sect409k1-tls12-in-tls13
-test-50 = 50-curve-sect409r1-tls12-in-tls13
-test-51 = 51-curve-sect571k1-tls12-in-tls13
-test-52 = 52-curve-sect571r1-tls12-in-tls13
-test-53 = 53-curve-secp224r1-tls12-in-tls13
-test-54 = 54-curve-sect163k1-tls12-in-tls13
-test-55 = 55-curve-sect163r2-tls12-in-tls13
-test-56 = 56-curve-prime192v1-tls12-in-tls13
-test-57 = 57-curve-sect163r1-tls12-in-tls13
-test-58 = 58-curve-sect193r1-tls12-in-tls13
-test-59 = 59-curve-sect193r2-tls12-in-tls13
-test-60 = 60-curve-sect239k1-tls12-in-tls13
-test-61 = 61-curve-secp160k1-tls12-in-tls13
-test-62 = 62-curve-secp160r1-tls12-in-tls13
-test-63 = 63-curve-secp160r2-tls12-in-tls13
-test-64 = 64-curve-secp192k1-tls12-in-tls13
-test-65 = 65-curve-secp224k1-tls12-in-tls13
-test-66 = 66-curve-secp256k1-tls12-in-tls13
-test-67 = 67-curve-brainpoolP256r1-tls12-in-tls13
-test-68 = 68-curve-brainpoolP384r1-tls12-in-tls13
-test-69 = 69-curve-brainpoolP512r1-tls12-in-tls13
-test-70 = 70-curve-sect233k1-tls13
-test-71 = 71-curve-sect233r1-tls13
-test-72 = 72-curve-sect283k1-tls13
-test-73 = 73-curve-sect283r1-tls13
-test-74 = 74-curve-sect409k1-tls13
-test-75 = 75-curve-sect409r1-tls13
-test-76 = 76-curve-sect571k1-tls13
-test-77 = 77-curve-sect571r1-tls13
-test-78 = 78-curve-secp224r1-tls13
-test-79 = 79-curve-sect163k1-tls13
-test-80 = 80-curve-sect163r2-tls13
-test-81 = 81-curve-prime192v1-tls13
-test-82 = 82-curve-sect163r1-tls13
-test-83 = 83-curve-sect193r1-tls13
-test-84 = 84-curve-sect193r2-tls13
-test-85 = 85-curve-sect239k1-tls13
-test-86 = 86-curve-secp160k1-tls13
-test-87 = 87-curve-secp160r1-tls13
-test-88 = 88-curve-secp160r2-tls13
-test-89 = 89-curve-secp192k1-tls13
-test-90 = 90-curve-secp224k1-tls13
-test-91 = 91-curve-secp256k1-tls13
-test-92 = 92-curve-brainpoolP256r1-tls13
-test-93 = 93-curve-brainpoolP384r1-tls13
-test-94 = 94-curve-brainpoolP512r1-tls13
-test-95 = 95-curve-ffdhe2048-tls13-in-tls12
-test-96 = 96-curve-ffdhe2048-tls13-in-tls12-2
-test-97 = 97-curve-ffdhe3072-tls13-in-tls12
-test-98 = 98-curve-ffdhe3072-tls13-in-tls12-2
-test-99 = 99-curve-ffdhe4096-tls13-in-tls12
-test-100 = 100-curve-ffdhe4096-tls13-in-tls12-2
-test-101 = 101-curve-ffdhe6144-tls13-in-tls12
-test-102 = 102-curve-ffdhe6144-tls13-in-tls12-2
-test-103 = 103-curve-ffdhe8192-tls13-in-tls12
+test-20 = 20-curve-ffdhe2048
+test-21 = 21-curve-ffdhe3072
+test-22 = 22-curve-ffdhe4096
+test-23 = 23-curve-ffdhe6144
+test-24 = 24-curve-ffdhe8192
+test-25 = 25-curve-sect233k1
+test-26 = 26-curve-sect233r1
+test-27 = 27-curve-sect283k1
+test-28 = 28-curve-sect283r1
+test-29 = 29-curve-sect409k1
+test-30 = 30-curve-sect409r1
+test-31 = 31-curve-sect571k1
+test-32 = 32-curve-sect571r1
+test-33 = 33-curve-secp224r1
+test-34 = 34-curve-sect163k1
+test-35 = 35-curve-sect163r2
+test-36 = 36-curve-prime192v1
+test-37 = 37-curve-sect163r1
+test-38 = 38-curve-sect193r1
+test-39 = 39-curve-sect193r2
+test-40 = 40-curve-sect239k1
+test-41 = 41-curve-secp160k1
+test-42 = 42-curve-secp160r1
+test-43 = 43-curve-secp160r2
+test-44 = 44-curve-secp192k1
+test-45 = 45-curve-secp224k1
+test-46 = 46-curve-secp256k1
+test-47 = 47-curve-brainpoolP256r1
+test-48 = 48-curve-brainpoolP384r1
+test-49 = 49-curve-brainpoolP512r1
+test-50 = 50-curve-sect233k1-tls12-in-tls13
+test-51 = 51-curve-sect233r1-tls12-in-tls13
+test-52 = 52-curve-sect283k1-tls12-in-tls13
+test-53 = 53-curve-sect283r1-tls12-in-tls13
+test-54 = 54-curve-sect409k1-tls12-in-tls13
+test-55 = 55-curve-sect409r1-tls12-in-tls13
+test-56 = 56-curve-sect571k1-tls12-in-tls13
+test-57 = 57-curve-sect571r1-tls12-in-tls13
+test-58 = 58-curve-secp224r1-tls12-in-tls13
+test-59 = 59-curve-sect163k1-tls12-in-tls13
+test-60 = 60-curve-sect163r2-tls12-in-tls13
+test-61 = 61-curve-prime192v1-tls12-in-tls13
+test-62 = 62-curve-sect163r1-tls12-in-tls13
+test-63 = 63-curve-sect193r1-tls12-in-tls13
+test-64 = 64-curve-sect193r2-tls12-in-tls13
+test-65 = 65-curve-sect239k1-tls12-in-tls13
+test-66 = 66-curve-secp160k1-tls12-in-tls13
+test-67 = 67-curve-secp160r1-tls12-in-tls13
+test-68 = 68-curve-secp160r2-tls12-in-tls13
+test-69 = 69-curve-secp192k1-tls12-in-tls13
+test-70 = 70-curve-secp224k1-tls12-in-tls13
+test-71 = 71-curve-secp256k1-tls12-in-tls13
+test-72 = 72-curve-brainpoolP256r1-tls12-in-tls13
+test-73 = 73-curve-brainpoolP384r1-tls12-in-tls13
+test-74 = 74-curve-brainpoolP512r1-tls12-in-tls13
+test-75 = 75-curve-sect233k1-tls13
+test-76 = 76-curve-sect233r1-tls13
+test-77 = 77-curve-sect283k1-tls13
+test-78 = 78-curve-sect283r1-tls13
+test-79 = 79-curve-sect409k1-tls13
+test-80 = 80-curve-sect409r1-tls13
+test-81 = 81-curve-sect571k1-tls13
+test-82 = 82-curve-sect571r1-tls13
+test-83 = 83-curve-secp224r1-tls13
+test-84 = 84-curve-sect163k1-tls13
+test-85 = 85-curve-sect163r2-tls13
+test-86 = 86-curve-prime192v1-tls13
+test-87 = 87-curve-sect163r1-tls13
+test-88 = 88-curve-sect193r1-tls13
+test-89 = 89-curve-sect193r2-tls13
+test-90 = 90-curve-sect239k1-tls13
+test-91 = 91-curve-secp160k1-tls13
+test-92 = 92-curve-secp160r1-tls13
+test-93 = 93-curve-secp160r2-tls13
+test-94 = 94-curve-secp192k1-tls13
+test-95 = 95-curve-secp224k1-tls13
+test-96 = 96-curve-secp256k1-tls13
+test-97 = 97-curve-brainpoolP256r1-tls13
+test-98 = 98-curve-brainpoolP384r1-tls13
+test-99 = 99-curve-brainpoolP512r1-tls13
+test-100 = 100-curve-ffdhe2048-tls13-in-tls12-2
+test-101 = 101-curve-ffdhe3072-tls13-in-tls12-2
+test-102 = 102-curve-ffdhe4096-tls13-in-tls12-2
+test-103 = 103-curve-ffdhe6144-tls13-in-tls12-2
test-104 = 104-curve-ffdhe8192-tls13-in-tls12-2
test-105 = 105-curve-brainpoolP256r1tls13-tls13-in-tls12
test-106 = 106-curve-brainpoolP256r1tls13-tls13-in-tls12-2
@@ -289,7 +289,7 @@ MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[5-curve-ffdhe2048-client]
-CipherString = ECDHE@SECLEVEL=1
+CipherString = DHE@SECLEVEL=1
Curves = ffdhe2048
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
@@ -298,7 +298,7 @@ VerifyMode = Peer
[test-5]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
-ExpectedTmpKeyType = dhKeyAgreement
+ExpectedTmpKeyType = ffdhe2048
# ===========================================================
@@ -318,7 +318,7 @@ MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[6-curve-ffdhe3072-client]
-CipherString = ECDHE@SECLEVEL=1
+CipherString = DHE@SECLEVEL=1
Curves = ffdhe3072
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
@@ -327,7 +327,7 @@ VerifyMode = Peer
[test-6]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
-ExpectedTmpKeyType = dhKeyAgreement
+ExpectedTmpKeyType = ffdhe3072
# ===========================================================
@@ -347,7 +347,7 @@ MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[7-curve-ffdhe4096-client]
-CipherString = ECDHE@SECLEVEL=1
+CipherString = DHE@SECLEVEL=1
Curves = ffdhe4096
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
@@ -356,7 +356,7 @@ VerifyMode = Peer
[test-7]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
-ExpectedTmpKeyType = dhKeyAgreement
+ExpectedTmpKeyType = ffdhe4096
# ===========================================================
@@ -376,7 +376,7 @@ MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[8-curve-ffdhe6144-client]
-CipherString = ECDHE@SECLEVEL=1
+CipherString = DHE@SECLEVEL=1
Curves = ffdhe6144
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
@@ -385,7 +385,7 @@ VerifyMode = Peer
[test-8]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
-ExpectedTmpKeyType = dhKeyAgreement
+ExpectedTmpKeyType = ffdhe6144
# ===========================================================
@@ -405,7 +405,7 @@ MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[9-curve-ffdhe8192-client]
-CipherString = ECDHE@SECLEVEL=1
+CipherString = DHE@SECLEVEL=1
Curves = ffdhe8192
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
@@ -414,7 +414,7 @@ VerifyMode = Peer
[test-9]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
-ExpectedTmpKeyType = dhKeyAgreement
+ExpectedTmpKeyType = ffdhe8192
# ===========================================================
@@ -709,28 +709,173 @@ ExpectedTmpKeyType = SecP256r1MLKEM512
# ===========================================================
-[20-curve-sect233k1]
-ssl_conf = 20-curve-sect233k1-ssl
+[20-curve-ffdhe2048]
+ssl_conf = 20-curve-ffdhe2048-ssl
+
+[20-curve-ffdhe2048-ssl]
+server = 20-curve-ffdhe2048-server
+client = 20-curve-ffdhe2048-client
+
+[20-curve-ffdhe2048-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT@SECLEVEL=1
+Curves = ffdhe2048
+MaxProtocol = TLSv1.3
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[20-curve-ffdhe2048-client]
+CipherString = DHE@SECLEVEL=1
+Curves = ffdhe2048
+MaxProtocol = TLSv1.2
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-20]
+ExpectedProtocol = TLSv1.2
+ExpectedResult = Success
+ExpectedTmpKeyType = dhKeyAgreement
+
+
+# ===========================================================
+
+[21-curve-ffdhe3072]
+ssl_conf = 21-curve-ffdhe3072-ssl
+
+[21-curve-ffdhe3072-ssl]
+server = 21-curve-ffdhe3072-server
+client = 21-curve-ffdhe3072-client
+
+[21-curve-ffdhe3072-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT@SECLEVEL=1
+Curves = ffdhe3072
+MaxProtocol = TLSv1.3
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[21-curve-ffdhe3072-client]
+CipherString = DHE@SECLEVEL=1
+Curves = ffdhe3072
+MaxProtocol = TLSv1.2
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-21]
+ExpectedProtocol = TLSv1.2
+ExpectedResult = Success
+ExpectedTmpKeyType = dhKeyAgreement
+
+
+# ===========================================================
+
+[22-curve-ffdhe4096]
+ssl_conf = 22-curve-ffdhe4096-ssl
+
+[22-curve-ffdhe4096-ssl]
+server = 22-curve-ffdhe4096-server
+client = 22-curve-ffdhe4096-client
+
+[22-curve-ffdhe4096-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT@SECLEVEL=1
+Curves = ffdhe4096
+MaxProtocol = TLSv1.3
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[22-curve-ffdhe4096-client]
+CipherString = DHE@SECLEVEL=1
+Curves = ffdhe4096
+MaxProtocol = TLSv1.2
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-22]
+ExpectedProtocol = TLSv1.2
+ExpectedResult = Success
+ExpectedTmpKeyType = dhKeyAgreement
+
+
+# ===========================================================
+
+[23-curve-ffdhe6144]
+ssl_conf = 23-curve-ffdhe6144-ssl
+
+[23-curve-ffdhe6144-ssl]
+server = 23-curve-ffdhe6144-server
+client = 23-curve-ffdhe6144-client
+
+[23-curve-ffdhe6144-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT@SECLEVEL=1
+Curves = ffdhe6144
+MaxProtocol = TLSv1.3
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[23-curve-ffdhe6144-client]
+CipherString = DHE@SECLEVEL=1
+Curves = ffdhe6144
+MaxProtocol = TLSv1.2
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-23]
+ExpectedProtocol = TLSv1.2
+ExpectedResult = Success
+ExpectedTmpKeyType = dhKeyAgreement
+
+
+# ===========================================================
+
+[24-curve-ffdhe8192]
+ssl_conf = 24-curve-ffdhe8192-ssl
-[20-curve-sect233k1-ssl]
-server = 20-curve-sect233k1-server
-client = 20-curve-sect233k1-client
+[24-curve-ffdhe8192-ssl]
+server = 24-curve-ffdhe8192-server
+client = 24-curve-ffdhe8192-client
-[20-curve-sect233k1-server]
+[24-curve-ffdhe8192-server]
+Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
+CipherString = DEFAULT@SECLEVEL=1
+Curves = ffdhe8192
+MaxProtocol = TLSv1.3
+PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
+
+[24-curve-ffdhe8192-client]
+CipherString = DHE@SECLEVEL=1
+Curves = ffdhe8192
+MaxProtocol = TLSv1.2
+VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
+VerifyMode = Peer
+
+[test-24]
+ExpectedProtocol = TLSv1.2
+ExpectedResult = Success
+ExpectedTmpKeyType = dhKeyAgreement
+
+
+# ===========================================================
+
+[25-curve-sect233k1]
+ssl_conf = 25-curve-sect233k1-ssl
+
+[25-curve-sect233k1-ssl]
+server = 25-curve-sect233k1-server
+client = 25-curve-sect233k1-client
+
+[25-curve-sect233k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect233k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[20-curve-sect233k1-client]
+[25-curve-sect233k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect233k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-20]
+[test-25]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect233k1
@@ -738,28 +883,28 @@ ExpectedTmpKeyType = sect233k1
# ===========================================================
-[21-curve-sect233r1]
-ssl_conf = 21-curve-sect233r1-ssl
+[26-curve-sect233r1]
+ssl_conf = 26-curve-sect233r1-ssl
-[21-curve-sect233r1-ssl]
-server = 21-curve-sect233r1-server
-client = 21-curve-sect233r1-client
+[26-curve-sect233r1-ssl]
+server = 26-curve-sect233r1-server
+client = 26-curve-sect233r1-client
-[21-curve-sect233r1-server]
+[26-curve-sect233r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect233r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[21-curve-sect233r1-client]
+[26-curve-sect233r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect233r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-21]
+[test-26]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect233r1
@@ -767,28 +912,28 @@ ExpectedTmpKeyType = sect233r1
# ===========================================================
-[22-curve-sect283k1]
-ssl_conf = 22-curve-sect283k1-ssl
+[27-curve-sect283k1]
+ssl_conf = 27-curve-sect283k1-ssl
-[22-curve-sect283k1-ssl]
-server = 22-curve-sect283k1-server
-client = 22-curve-sect283k1-client
+[27-curve-sect283k1-ssl]
+server = 27-curve-sect283k1-server
+client = 27-curve-sect283k1-client
-[22-curve-sect283k1-server]
+[27-curve-sect283k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect283k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[22-curve-sect283k1-client]
+[27-curve-sect283k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect283k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-22]
+[test-27]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect283k1
@@ -796,28 +941,28 @@ ExpectedTmpKeyType = sect283k1
# ===========================================================
-[23-curve-sect283r1]
-ssl_conf = 23-curve-sect283r1-ssl
+[28-curve-sect283r1]
+ssl_conf = 28-curve-sect283r1-ssl
-[23-curve-sect283r1-ssl]
-server = 23-curve-sect283r1-server
-client = 23-curve-sect283r1-client
+[28-curve-sect283r1-ssl]
+server = 28-curve-sect283r1-server
+client = 28-curve-sect283r1-client
-[23-curve-sect283r1-server]
+[28-curve-sect283r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect283r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[23-curve-sect283r1-client]
+[28-curve-sect283r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect283r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-23]
+[test-28]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect283r1
@@ -825,28 +970,28 @@ ExpectedTmpKeyType = sect283r1
# ===========================================================
-[24-curve-sect409k1]
-ssl_conf = 24-curve-sect409k1-ssl
+[29-curve-sect409k1]
+ssl_conf = 29-curve-sect409k1-ssl
-[24-curve-sect409k1-ssl]
-server = 24-curve-sect409k1-server
-client = 24-curve-sect409k1-client
+[29-curve-sect409k1-ssl]
+server = 29-curve-sect409k1-server
+client = 29-curve-sect409k1-client
-[24-curve-sect409k1-server]
+[29-curve-sect409k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect409k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[24-curve-sect409k1-client]
+[29-curve-sect409k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect409k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-24]
+[test-29]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect409k1
@@ -854,28 +999,28 @@ ExpectedTmpKeyType = sect409k1
# ===========================================================
-[25-curve-sect409r1]
-ssl_conf = 25-curve-sect409r1-ssl
+[30-curve-sect409r1]
+ssl_conf = 30-curve-sect409r1-ssl
-[25-curve-sect409r1-ssl]
-server = 25-curve-sect409r1-server
-client = 25-curve-sect409r1-client
+[30-curve-sect409r1-ssl]
+server = 30-curve-sect409r1-server
+client = 30-curve-sect409r1-client
-[25-curve-sect409r1-server]
+[30-curve-sect409r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect409r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[25-curve-sect409r1-client]
+[30-curve-sect409r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect409r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-25]
+[test-30]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect409r1
@@ -883,28 +1028,28 @@ ExpectedTmpKeyType = sect409r1
# ===========================================================
-[26-curve-sect571k1]
-ssl_conf = 26-curve-sect571k1-ssl
+[31-curve-sect571k1]
+ssl_conf = 31-curve-sect571k1-ssl
-[26-curve-sect571k1-ssl]
-server = 26-curve-sect571k1-server
-client = 26-curve-sect571k1-client
+[31-curve-sect571k1-ssl]
+server = 31-curve-sect571k1-server
+client = 31-curve-sect571k1-client
-[26-curve-sect571k1-server]
+[31-curve-sect571k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect571k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[26-curve-sect571k1-client]
+[31-curve-sect571k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect571k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-26]
+[test-31]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect571k1
@@ -912,28 +1057,28 @@ ExpectedTmpKeyType = sect571k1
# ===========================================================
-[27-curve-sect571r1]
-ssl_conf = 27-curve-sect571r1-ssl
+[32-curve-sect571r1]
+ssl_conf = 32-curve-sect571r1-ssl
-[27-curve-sect571r1-ssl]
-server = 27-curve-sect571r1-server
-client = 27-curve-sect571r1-client
+[32-curve-sect571r1-ssl]
+server = 32-curve-sect571r1-server
+client = 32-curve-sect571r1-client
-[27-curve-sect571r1-server]
+[32-curve-sect571r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect571r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[27-curve-sect571r1-client]
+[32-curve-sect571r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect571r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-27]
+[test-32]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect571r1
@@ -941,28 +1086,28 @@ ExpectedTmpKeyType = sect571r1
# ===========================================================
-[28-curve-secp224r1]
-ssl_conf = 28-curve-secp224r1-ssl
+[33-curve-secp224r1]
+ssl_conf = 33-curve-secp224r1-ssl
-[28-curve-secp224r1-ssl]
-server = 28-curve-secp224r1-server
-client = 28-curve-secp224r1-client
+[33-curve-secp224r1-ssl]
+server = 33-curve-secp224r1-server
+client = 33-curve-secp224r1-client
-[28-curve-secp224r1-server]
+[33-curve-secp224r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp224r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[28-curve-secp224r1-client]
+[33-curve-secp224r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp224r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-28]
+[test-33]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp224r1
@@ -970,28 +1115,28 @@ ExpectedTmpKeyType = secp224r1
# ===========================================================
-[29-curve-sect163k1]
-ssl_conf = 29-curve-sect163k1-ssl
+[34-curve-sect163k1]
+ssl_conf = 34-curve-sect163k1-ssl
-[29-curve-sect163k1-ssl]
-server = 29-curve-sect163k1-server
-client = 29-curve-sect163k1-client
+[34-curve-sect163k1-ssl]
+server = 34-curve-sect163k1-server
+client = 34-curve-sect163k1-client
-[29-curve-sect163k1-server]
+[34-curve-sect163k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[29-curve-sect163k1-client]
+[34-curve-sect163k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-29]
+[test-34]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect163k1
@@ -999,28 +1144,28 @@ ExpectedTmpKeyType = sect163k1
# ===========================================================
-[30-curve-sect163r2]
-ssl_conf = 30-curve-sect163r2-ssl
+[35-curve-sect163r2]
+ssl_conf = 35-curve-sect163r2-ssl
-[30-curve-sect163r2-ssl]
-server = 30-curve-sect163r2-server
-client = 30-curve-sect163r2-client
+[35-curve-sect163r2-ssl]
+server = 35-curve-sect163r2-server
+client = 35-curve-sect163r2-client
-[30-curve-sect163r2-server]
+[35-curve-sect163r2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163r2
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[30-curve-sect163r2-client]
+[35-curve-sect163r2-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163r2
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-30]
+[test-35]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect163r2
@@ -1028,28 +1173,28 @@ ExpectedTmpKeyType = sect163r2
# ===========================================================
-[31-curve-prime192v1]
-ssl_conf = 31-curve-prime192v1-ssl
+[36-curve-prime192v1]
+ssl_conf = 36-curve-prime192v1-ssl
-[31-curve-prime192v1-ssl]
-server = 31-curve-prime192v1-server
-client = 31-curve-prime192v1-client
+[36-curve-prime192v1-ssl]
+server = 36-curve-prime192v1-server
+client = 36-curve-prime192v1-client
-[31-curve-prime192v1-server]
+[36-curve-prime192v1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = prime192v1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[31-curve-prime192v1-client]
+[36-curve-prime192v1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = prime192v1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-31]
+[test-36]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = prime192v1
@@ -1057,28 +1202,28 @@ ExpectedTmpKeyType = prime192v1
# ===========================================================
-[32-curve-sect163r1]
-ssl_conf = 32-curve-sect163r1-ssl
+[37-curve-sect163r1]
+ssl_conf = 37-curve-sect163r1-ssl
-[32-curve-sect163r1-ssl]
-server = 32-curve-sect163r1-server
-client = 32-curve-sect163r1-client
+[37-curve-sect163r1-ssl]
+server = 37-curve-sect163r1-server
+client = 37-curve-sect163r1-client
-[32-curve-sect163r1-server]
+[37-curve-sect163r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[32-curve-sect163r1-client]
+[37-curve-sect163r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-32]
+[test-37]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect163r1
@@ -1086,28 +1231,28 @@ ExpectedTmpKeyType = sect163r1
# ===========================================================
-[33-curve-sect193r1]
-ssl_conf = 33-curve-sect193r1-ssl
+[38-curve-sect193r1]
+ssl_conf = 38-curve-sect193r1-ssl
-[33-curve-sect193r1-ssl]
-server = 33-curve-sect193r1-server
-client = 33-curve-sect193r1-client
+[38-curve-sect193r1-ssl]
+server = 38-curve-sect193r1-server
+client = 38-curve-sect193r1-client
-[33-curve-sect193r1-server]
+[38-curve-sect193r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect193r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[33-curve-sect193r1-client]
+[38-curve-sect193r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect193r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-33]
+[test-38]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect193r1
@@ -1115,28 +1260,28 @@ ExpectedTmpKeyType = sect193r1
# ===========================================================
-[34-curve-sect193r2]
-ssl_conf = 34-curve-sect193r2-ssl
+[39-curve-sect193r2]
+ssl_conf = 39-curve-sect193r2-ssl
-[34-curve-sect193r2-ssl]
-server = 34-curve-sect193r2-server
-client = 34-curve-sect193r2-client
+[39-curve-sect193r2-ssl]
+server = 39-curve-sect193r2-server
+client = 39-curve-sect193r2-client
-[34-curve-sect193r2-server]
+[39-curve-sect193r2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect193r2
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[34-curve-sect193r2-client]
+[39-curve-sect193r2-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect193r2
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-34]
+[test-39]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect193r2
@@ -1144,28 +1289,28 @@ ExpectedTmpKeyType = sect193r2
# ===========================================================
-[35-curve-sect239k1]
-ssl_conf = 35-curve-sect239k1-ssl
+[40-curve-sect239k1]
+ssl_conf = 40-curve-sect239k1-ssl
-[35-curve-sect239k1-ssl]
-server = 35-curve-sect239k1-server
-client = 35-curve-sect239k1-client
+[40-curve-sect239k1-ssl]
+server = 40-curve-sect239k1-server
+client = 40-curve-sect239k1-client
-[35-curve-sect239k1-server]
+[40-curve-sect239k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect239k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[35-curve-sect239k1-client]
+[40-curve-sect239k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect239k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-35]
+[test-40]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = sect239k1
@@ -1173,28 +1318,28 @@ ExpectedTmpKeyType = sect239k1
# ===========================================================
-[36-curve-secp160k1]
-ssl_conf = 36-curve-secp160k1-ssl
+[41-curve-secp160k1]
+ssl_conf = 41-curve-secp160k1-ssl
-[36-curve-secp160k1-ssl]
-server = 36-curve-secp160k1-server
-client = 36-curve-secp160k1-client
+[41-curve-secp160k1-ssl]
+server = 41-curve-secp160k1-server
+client = 41-curve-secp160k1-client
-[36-curve-secp160k1-server]
+[41-curve-secp160k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[36-curve-secp160k1-client]
+[41-curve-secp160k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-36]
+[test-41]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp160k1
@@ -1202,28 +1347,28 @@ ExpectedTmpKeyType = secp160k1
# ===========================================================
-[37-curve-secp160r1]
-ssl_conf = 37-curve-secp160r1-ssl
+[42-curve-secp160r1]
+ssl_conf = 42-curve-secp160r1-ssl
-[37-curve-secp160r1-ssl]
-server = 37-curve-secp160r1-server
-client = 37-curve-secp160r1-client
+[42-curve-secp160r1-ssl]
+server = 42-curve-secp160r1-server
+client = 42-curve-secp160r1-client
-[37-curve-secp160r1-server]
+[42-curve-secp160r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[37-curve-secp160r1-client]
+[42-curve-secp160r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-37]
+[test-42]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp160r1
@@ -1231,28 +1376,28 @@ ExpectedTmpKeyType = secp160r1
# ===========================================================
-[38-curve-secp160r2]
-ssl_conf = 38-curve-secp160r2-ssl
+[43-curve-secp160r2]
+ssl_conf = 43-curve-secp160r2-ssl
-[38-curve-secp160r2-ssl]
-server = 38-curve-secp160r2-server
-client = 38-curve-secp160r2-client
+[43-curve-secp160r2-ssl]
+server = 43-curve-secp160r2-server
+client = 43-curve-secp160r2-client
-[38-curve-secp160r2-server]
+[43-curve-secp160r2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160r2
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[38-curve-secp160r2-client]
+[43-curve-secp160r2-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160r2
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-38]
+[test-43]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp160r2
@@ -1260,28 +1405,28 @@ ExpectedTmpKeyType = secp160r2
# ===========================================================
-[39-curve-secp192k1]
-ssl_conf = 39-curve-secp192k1-ssl
+[44-curve-secp192k1]
+ssl_conf = 44-curve-secp192k1-ssl
-[39-curve-secp192k1-ssl]
-server = 39-curve-secp192k1-server
-client = 39-curve-secp192k1-client
+[44-curve-secp192k1-ssl]
+server = 44-curve-secp192k1-server
+client = 44-curve-secp192k1-client
-[39-curve-secp192k1-server]
+[44-curve-secp192k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp192k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[39-curve-secp192k1-client]
+[44-curve-secp192k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp192k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-39]
+[test-44]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp192k1
@@ -1289,28 +1434,28 @@ ExpectedTmpKeyType = secp192k1
# ===========================================================
-[40-curve-secp224k1]
-ssl_conf = 40-curve-secp224k1-ssl
+[45-curve-secp224k1]
+ssl_conf = 45-curve-secp224k1-ssl
-[40-curve-secp224k1-ssl]
-server = 40-curve-secp224k1-server
-client = 40-curve-secp224k1-client
+[45-curve-secp224k1-ssl]
+server = 45-curve-secp224k1-server
+client = 45-curve-secp224k1-client
-[40-curve-secp224k1-server]
+[45-curve-secp224k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp224k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[40-curve-secp224k1-client]
+[45-curve-secp224k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp224k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-40]
+[test-45]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp224k1
@@ -1318,28 +1463,28 @@ ExpectedTmpKeyType = secp224k1
# ===========================================================
-[41-curve-secp256k1]
-ssl_conf = 41-curve-secp256k1-ssl
+[46-curve-secp256k1]
+ssl_conf = 46-curve-secp256k1-ssl
-[41-curve-secp256k1-ssl]
-server = 41-curve-secp256k1-server
-client = 41-curve-secp256k1-client
+[46-curve-secp256k1-ssl]
+server = 46-curve-secp256k1-server
+client = 46-curve-secp256k1-client
-[41-curve-secp256k1-server]
+[46-curve-secp256k1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp256k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[41-curve-secp256k1-client]
+[46-curve-secp256k1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp256k1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-41]
+[test-46]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = secp256k1
@@ -1347,28 +1492,28 @@ ExpectedTmpKeyType = secp256k1
# ===========================================================
-[42-curve-brainpoolP256r1]
-ssl_conf = 42-curve-brainpoolP256r1-ssl
+[47-curve-brainpoolP256r1]
+ssl_conf = 47-curve-brainpoolP256r1-ssl
-[42-curve-brainpoolP256r1-ssl]
-server = 42-curve-brainpoolP256r1-server
-client = 42-curve-brainpoolP256r1-client
+[47-curve-brainpoolP256r1-ssl]
+server = 47-curve-brainpoolP256r1-server
+client = 47-curve-brainpoolP256r1-client
-[42-curve-brainpoolP256r1-server]
+[47-curve-brainpoolP256r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP256r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[42-curve-brainpoolP256r1-client]
+[47-curve-brainpoolP256r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP256r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-42]
+[test-47]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = brainpoolP256r1
@@ -1376,28 +1521,28 @@ ExpectedTmpKeyType = brainpoolP256r1
# ===========================================================
-[43-curve-brainpoolP384r1]
-ssl_conf = 43-curve-brainpoolP384r1-ssl
+[48-curve-brainpoolP384r1]
+ssl_conf = 48-curve-brainpoolP384r1-ssl
-[43-curve-brainpoolP384r1-ssl]
-server = 43-curve-brainpoolP384r1-server
-client = 43-curve-brainpoolP384r1-client
+[48-curve-brainpoolP384r1-ssl]
+server = 48-curve-brainpoolP384r1-server
+client = 48-curve-brainpoolP384r1-client
-[43-curve-brainpoolP384r1-server]
+[48-curve-brainpoolP384r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP384r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[43-curve-brainpoolP384r1-client]
+[48-curve-brainpoolP384r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP384r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-43]
+[test-48]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = brainpoolP384r1
@@ -1405,28 +1550,28 @@ ExpectedTmpKeyType = brainpoolP384r1
# ===========================================================
-[44-curve-brainpoolP512r1]
-ssl_conf = 44-curve-brainpoolP512r1-ssl
+[49-curve-brainpoolP512r1]
+ssl_conf = 49-curve-brainpoolP512r1-ssl
-[44-curve-brainpoolP512r1-ssl]
-server = 44-curve-brainpoolP512r1-server
-client = 44-curve-brainpoolP512r1-client
+[49-curve-brainpoolP512r1-ssl]
+server = 49-curve-brainpoolP512r1-server
+client = 49-curve-brainpoolP512r1-client
-[44-curve-brainpoolP512r1-server]
+[49-curve-brainpoolP512r1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP512r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[44-curve-brainpoolP512r1-client]
+[49-curve-brainpoolP512r1-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP512r1
MaxProtocol = TLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-44]
+[test-49]
ExpectedProtocol = TLSv1.2
ExpectedResult = Success
ExpectedTmpKeyType = brainpoolP512r1
@@ -1434,21 +1579,21 @@ ExpectedTmpKeyType = brainpoolP512r1
# ===========================================================
-[45-curve-sect233k1-tls12-in-tls13]
-ssl_conf = 45-curve-sect233k1-tls12-in-tls13-ssl
+[50-curve-sect233k1-tls12-in-tls13]
+ssl_conf = 50-curve-sect233k1-tls12-in-tls13-ssl
-[45-curve-sect233k1-tls12-in-tls13-ssl]
-server = 45-curve-sect233k1-tls12-in-tls13-server
-client = 45-curve-sect233k1-tls12-in-tls13-client
+[50-curve-sect233k1-tls12-in-tls13-ssl]
+server = 50-curve-sect233k1-tls12-in-tls13-server
+client = 50-curve-sect233k1-tls12-in-tls13-client
-[45-curve-sect233k1-tls12-in-tls13-server]
+[50-curve-sect233k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect233k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[45-curve-sect233k1-tls12-in-tls13-client]
+[50-curve-sect233k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect233k1:P-256
MaxProtocol = TLSv1.3
@@ -1456,7 +1601,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-45]
+[test-50]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1464,21 +1609,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[46-curve-sect233r1-tls12-in-tls13]
-ssl_conf = 46-curve-sect233r1-tls12-in-tls13-ssl
+[51-curve-sect233r1-tls12-in-tls13]
+ssl_conf = 51-curve-sect233r1-tls12-in-tls13-ssl
-[46-curve-sect233r1-tls12-in-tls13-ssl]
-server = 46-curve-sect233r1-tls12-in-tls13-server
-client = 46-curve-sect233r1-tls12-in-tls13-client
+[51-curve-sect233r1-tls12-in-tls13-ssl]
+server = 51-curve-sect233r1-tls12-in-tls13-server
+client = 51-curve-sect233r1-tls12-in-tls13-client
-[46-curve-sect233r1-tls12-in-tls13-server]
+[51-curve-sect233r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect233r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[46-curve-sect233r1-tls12-in-tls13-client]
+[51-curve-sect233r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect233r1:P-256
MaxProtocol = TLSv1.3
@@ -1486,7 +1631,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-46]
+[test-51]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1494,21 +1639,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[47-curve-sect283k1-tls12-in-tls13]
-ssl_conf = 47-curve-sect283k1-tls12-in-tls13-ssl
+[52-curve-sect283k1-tls12-in-tls13]
+ssl_conf = 52-curve-sect283k1-tls12-in-tls13-ssl
-[47-curve-sect283k1-tls12-in-tls13-ssl]
-server = 47-curve-sect283k1-tls12-in-tls13-server
-client = 47-curve-sect283k1-tls12-in-tls13-client
+[52-curve-sect283k1-tls12-in-tls13-ssl]
+server = 52-curve-sect283k1-tls12-in-tls13-server
+client = 52-curve-sect283k1-tls12-in-tls13-client
-[47-curve-sect283k1-tls12-in-tls13-server]
+[52-curve-sect283k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect283k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[47-curve-sect283k1-tls12-in-tls13-client]
+[52-curve-sect283k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect283k1:P-256
MaxProtocol = TLSv1.3
@@ -1516,7 +1661,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-47]
+[test-52]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1524,21 +1669,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[48-curve-sect283r1-tls12-in-tls13]
-ssl_conf = 48-curve-sect283r1-tls12-in-tls13-ssl
+[53-curve-sect283r1-tls12-in-tls13]
+ssl_conf = 53-curve-sect283r1-tls12-in-tls13-ssl
-[48-curve-sect283r1-tls12-in-tls13-ssl]
-server = 48-curve-sect283r1-tls12-in-tls13-server
-client = 48-curve-sect283r1-tls12-in-tls13-client
+[53-curve-sect283r1-tls12-in-tls13-ssl]
+server = 53-curve-sect283r1-tls12-in-tls13-server
+client = 53-curve-sect283r1-tls12-in-tls13-client
-[48-curve-sect283r1-tls12-in-tls13-server]
+[53-curve-sect283r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect283r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[48-curve-sect283r1-tls12-in-tls13-client]
+[53-curve-sect283r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect283r1:P-256
MaxProtocol = TLSv1.3
@@ -1546,7 +1691,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-48]
+[test-53]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1554,21 +1699,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[49-curve-sect409k1-tls12-in-tls13]
-ssl_conf = 49-curve-sect409k1-tls12-in-tls13-ssl
+[54-curve-sect409k1-tls12-in-tls13]
+ssl_conf = 54-curve-sect409k1-tls12-in-tls13-ssl
-[49-curve-sect409k1-tls12-in-tls13-ssl]
-server = 49-curve-sect409k1-tls12-in-tls13-server
-client = 49-curve-sect409k1-tls12-in-tls13-client
+[54-curve-sect409k1-tls12-in-tls13-ssl]
+server = 54-curve-sect409k1-tls12-in-tls13-server
+client = 54-curve-sect409k1-tls12-in-tls13-client
-[49-curve-sect409k1-tls12-in-tls13-server]
+[54-curve-sect409k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect409k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[49-curve-sect409k1-tls12-in-tls13-client]
+[54-curve-sect409k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect409k1:P-256
MaxProtocol = TLSv1.3
@@ -1576,7 +1721,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-49]
+[test-54]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1584,21 +1729,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[50-curve-sect409r1-tls12-in-tls13]
-ssl_conf = 50-curve-sect409r1-tls12-in-tls13-ssl
+[55-curve-sect409r1-tls12-in-tls13]
+ssl_conf = 55-curve-sect409r1-tls12-in-tls13-ssl
-[50-curve-sect409r1-tls12-in-tls13-ssl]
-server = 50-curve-sect409r1-tls12-in-tls13-server
-client = 50-curve-sect409r1-tls12-in-tls13-client
+[55-curve-sect409r1-tls12-in-tls13-ssl]
+server = 55-curve-sect409r1-tls12-in-tls13-server
+client = 55-curve-sect409r1-tls12-in-tls13-client
-[50-curve-sect409r1-tls12-in-tls13-server]
+[55-curve-sect409r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect409r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[50-curve-sect409r1-tls12-in-tls13-client]
+[55-curve-sect409r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect409r1:P-256
MaxProtocol = TLSv1.3
@@ -1606,7 +1751,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-50]
+[test-55]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1614,21 +1759,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[51-curve-sect571k1-tls12-in-tls13]
-ssl_conf = 51-curve-sect571k1-tls12-in-tls13-ssl
+[56-curve-sect571k1-tls12-in-tls13]
+ssl_conf = 56-curve-sect571k1-tls12-in-tls13-ssl
-[51-curve-sect571k1-tls12-in-tls13-ssl]
-server = 51-curve-sect571k1-tls12-in-tls13-server
-client = 51-curve-sect571k1-tls12-in-tls13-client
+[56-curve-sect571k1-tls12-in-tls13-ssl]
+server = 56-curve-sect571k1-tls12-in-tls13-server
+client = 56-curve-sect571k1-tls12-in-tls13-client
-[51-curve-sect571k1-tls12-in-tls13-server]
+[56-curve-sect571k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect571k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[51-curve-sect571k1-tls12-in-tls13-client]
+[56-curve-sect571k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect571k1:P-256
MaxProtocol = TLSv1.3
@@ -1636,7 +1781,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-51]
+[test-56]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1644,21 +1789,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[52-curve-sect571r1-tls12-in-tls13]
-ssl_conf = 52-curve-sect571r1-tls12-in-tls13-ssl
+[57-curve-sect571r1-tls12-in-tls13]
+ssl_conf = 57-curve-sect571r1-tls12-in-tls13-ssl
-[52-curve-sect571r1-tls12-in-tls13-ssl]
-server = 52-curve-sect571r1-tls12-in-tls13-server
-client = 52-curve-sect571r1-tls12-in-tls13-client
+[57-curve-sect571r1-tls12-in-tls13-ssl]
+server = 57-curve-sect571r1-tls12-in-tls13-server
+client = 57-curve-sect571r1-tls12-in-tls13-client
-[52-curve-sect571r1-tls12-in-tls13-server]
+[57-curve-sect571r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect571r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[52-curve-sect571r1-tls12-in-tls13-client]
+[57-curve-sect571r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect571r1:P-256
MaxProtocol = TLSv1.3
@@ -1666,7 +1811,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-52]
+[test-57]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1674,21 +1819,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[53-curve-secp224r1-tls12-in-tls13]
-ssl_conf = 53-curve-secp224r1-tls12-in-tls13-ssl
+[58-curve-secp224r1-tls12-in-tls13]
+ssl_conf = 58-curve-secp224r1-tls12-in-tls13-ssl
-[53-curve-secp224r1-tls12-in-tls13-ssl]
-server = 53-curve-secp224r1-tls12-in-tls13-server
-client = 53-curve-secp224r1-tls12-in-tls13-client
+[58-curve-secp224r1-tls12-in-tls13-ssl]
+server = 58-curve-secp224r1-tls12-in-tls13-server
+client = 58-curve-secp224r1-tls12-in-tls13-client
-[53-curve-secp224r1-tls12-in-tls13-server]
+[58-curve-secp224r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp224r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[53-curve-secp224r1-tls12-in-tls13-client]
+[58-curve-secp224r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp224r1:P-256
MaxProtocol = TLSv1.3
@@ -1696,7 +1841,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-53]
+[test-58]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1704,21 +1849,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[54-curve-sect163k1-tls12-in-tls13]
-ssl_conf = 54-curve-sect163k1-tls12-in-tls13-ssl
+[59-curve-sect163k1-tls12-in-tls13]
+ssl_conf = 59-curve-sect163k1-tls12-in-tls13-ssl
-[54-curve-sect163k1-tls12-in-tls13-ssl]
-server = 54-curve-sect163k1-tls12-in-tls13-server
-client = 54-curve-sect163k1-tls12-in-tls13-client
+[59-curve-sect163k1-tls12-in-tls13-ssl]
+server = 59-curve-sect163k1-tls12-in-tls13-server
+client = 59-curve-sect163k1-tls12-in-tls13-client
-[54-curve-sect163k1-tls12-in-tls13-server]
+[59-curve-sect163k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[54-curve-sect163k1-tls12-in-tls13-client]
+[59-curve-sect163k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163k1:P-256
MaxProtocol = TLSv1.3
@@ -1726,7 +1871,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-54]
+[test-59]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1734,21 +1879,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[55-curve-sect163r2-tls12-in-tls13]
-ssl_conf = 55-curve-sect163r2-tls12-in-tls13-ssl
+[60-curve-sect163r2-tls12-in-tls13]
+ssl_conf = 60-curve-sect163r2-tls12-in-tls13-ssl
-[55-curve-sect163r2-tls12-in-tls13-ssl]
-server = 55-curve-sect163r2-tls12-in-tls13-server
-client = 55-curve-sect163r2-tls12-in-tls13-client
+[60-curve-sect163r2-tls12-in-tls13-ssl]
+server = 60-curve-sect163r2-tls12-in-tls13-server
+client = 60-curve-sect163r2-tls12-in-tls13-client
-[55-curve-sect163r2-tls12-in-tls13-server]
+[60-curve-sect163r2-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163r2:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[55-curve-sect163r2-tls12-in-tls13-client]
+[60-curve-sect163r2-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163r2:P-256
MaxProtocol = TLSv1.3
@@ -1756,7 +1901,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-55]
+[test-60]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1764,21 +1909,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[56-curve-prime192v1-tls12-in-tls13]
-ssl_conf = 56-curve-prime192v1-tls12-in-tls13-ssl
+[61-curve-prime192v1-tls12-in-tls13]
+ssl_conf = 61-curve-prime192v1-tls12-in-tls13-ssl
-[56-curve-prime192v1-tls12-in-tls13-ssl]
-server = 56-curve-prime192v1-tls12-in-tls13-server
-client = 56-curve-prime192v1-tls12-in-tls13-client
+[61-curve-prime192v1-tls12-in-tls13-ssl]
+server = 61-curve-prime192v1-tls12-in-tls13-server
+client = 61-curve-prime192v1-tls12-in-tls13-client
-[56-curve-prime192v1-tls12-in-tls13-server]
+[61-curve-prime192v1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = prime192v1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[56-curve-prime192v1-tls12-in-tls13-client]
+[61-curve-prime192v1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = prime192v1:P-256
MaxProtocol = TLSv1.3
@@ -1786,7 +1931,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-56]
+[test-61]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1794,21 +1939,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[57-curve-sect163r1-tls12-in-tls13]
-ssl_conf = 57-curve-sect163r1-tls12-in-tls13-ssl
+[62-curve-sect163r1-tls12-in-tls13]
+ssl_conf = 62-curve-sect163r1-tls12-in-tls13-ssl
-[57-curve-sect163r1-tls12-in-tls13-ssl]
-server = 57-curve-sect163r1-tls12-in-tls13-server
-client = 57-curve-sect163r1-tls12-in-tls13-client
+[62-curve-sect163r1-tls12-in-tls13-ssl]
+server = 62-curve-sect163r1-tls12-in-tls13-server
+client = 62-curve-sect163r1-tls12-in-tls13-client
-[57-curve-sect163r1-tls12-in-tls13-server]
+[62-curve-sect163r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[57-curve-sect163r1-tls12-in-tls13-client]
+[62-curve-sect163r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163r1:P-256
MaxProtocol = TLSv1.3
@@ -1816,7 +1961,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-57]
+[test-62]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1824,21 +1969,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[58-curve-sect193r1-tls12-in-tls13]
-ssl_conf = 58-curve-sect193r1-tls12-in-tls13-ssl
+[63-curve-sect193r1-tls12-in-tls13]
+ssl_conf = 63-curve-sect193r1-tls12-in-tls13-ssl
-[58-curve-sect193r1-tls12-in-tls13-ssl]
-server = 58-curve-sect193r1-tls12-in-tls13-server
-client = 58-curve-sect193r1-tls12-in-tls13-client
+[63-curve-sect193r1-tls12-in-tls13-ssl]
+server = 63-curve-sect193r1-tls12-in-tls13-server
+client = 63-curve-sect193r1-tls12-in-tls13-client
-[58-curve-sect193r1-tls12-in-tls13-server]
+[63-curve-sect193r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect193r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[58-curve-sect193r1-tls12-in-tls13-client]
+[63-curve-sect193r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect193r1:P-256
MaxProtocol = TLSv1.3
@@ -1846,7 +1991,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-58]
+[test-63]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1854,21 +1999,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[59-curve-sect193r2-tls12-in-tls13]
-ssl_conf = 59-curve-sect193r2-tls12-in-tls13-ssl
+[64-curve-sect193r2-tls12-in-tls13]
+ssl_conf = 64-curve-sect193r2-tls12-in-tls13-ssl
-[59-curve-sect193r2-tls12-in-tls13-ssl]
-server = 59-curve-sect193r2-tls12-in-tls13-server
-client = 59-curve-sect193r2-tls12-in-tls13-client
+[64-curve-sect193r2-tls12-in-tls13-ssl]
+server = 64-curve-sect193r2-tls12-in-tls13-server
+client = 64-curve-sect193r2-tls12-in-tls13-client
-[59-curve-sect193r2-tls12-in-tls13-server]
+[64-curve-sect193r2-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect193r2:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[59-curve-sect193r2-tls12-in-tls13-client]
+[64-curve-sect193r2-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect193r2:P-256
MaxProtocol = TLSv1.3
@@ -1876,7 +2021,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-59]
+[test-64]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1884,21 +2029,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[60-curve-sect239k1-tls12-in-tls13]
-ssl_conf = 60-curve-sect239k1-tls12-in-tls13-ssl
+[65-curve-sect239k1-tls12-in-tls13]
+ssl_conf = 65-curve-sect239k1-tls12-in-tls13-ssl
-[60-curve-sect239k1-tls12-in-tls13-ssl]
-server = 60-curve-sect239k1-tls12-in-tls13-server
-client = 60-curve-sect239k1-tls12-in-tls13-client
+[65-curve-sect239k1-tls12-in-tls13-ssl]
+server = 65-curve-sect239k1-tls12-in-tls13-server
+client = 65-curve-sect239k1-tls12-in-tls13-client
-[60-curve-sect239k1-tls12-in-tls13-server]
+[65-curve-sect239k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect239k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[60-curve-sect239k1-tls12-in-tls13-client]
+[65-curve-sect239k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect239k1:P-256
MaxProtocol = TLSv1.3
@@ -1906,7 +2051,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-60]
+[test-65]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1914,21 +2059,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[61-curve-secp160k1-tls12-in-tls13]
-ssl_conf = 61-curve-secp160k1-tls12-in-tls13-ssl
+[66-curve-secp160k1-tls12-in-tls13]
+ssl_conf = 66-curve-secp160k1-tls12-in-tls13-ssl
-[61-curve-secp160k1-tls12-in-tls13-ssl]
-server = 61-curve-secp160k1-tls12-in-tls13-server
-client = 61-curve-secp160k1-tls12-in-tls13-client
+[66-curve-secp160k1-tls12-in-tls13-ssl]
+server = 66-curve-secp160k1-tls12-in-tls13-server
+client = 66-curve-secp160k1-tls12-in-tls13-client
-[61-curve-secp160k1-tls12-in-tls13-server]
+[66-curve-secp160k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[61-curve-secp160k1-tls12-in-tls13-client]
+[66-curve-secp160k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160k1:P-256
MaxProtocol = TLSv1.3
@@ -1936,7 +2081,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-61]
+[test-66]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1944,21 +2089,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[62-curve-secp160r1-tls12-in-tls13]
-ssl_conf = 62-curve-secp160r1-tls12-in-tls13-ssl
+[67-curve-secp160r1-tls12-in-tls13]
+ssl_conf = 67-curve-secp160r1-tls12-in-tls13-ssl
-[62-curve-secp160r1-tls12-in-tls13-ssl]
-server = 62-curve-secp160r1-tls12-in-tls13-server
-client = 62-curve-secp160r1-tls12-in-tls13-client
+[67-curve-secp160r1-tls12-in-tls13-ssl]
+server = 67-curve-secp160r1-tls12-in-tls13-server
+client = 67-curve-secp160r1-tls12-in-tls13-client
-[62-curve-secp160r1-tls12-in-tls13-server]
+[67-curve-secp160r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[62-curve-secp160r1-tls12-in-tls13-client]
+[67-curve-secp160r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160r1:P-256
MaxProtocol = TLSv1.3
@@ -1966,7 +2111,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-62]
+[test-67]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -1974,21 +2119,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[63-curve-secp160r2-tls12-in-tls13]
-ssl_conf = 63-curve-secp160r2-tls12-in-tls13-ssl
+[68-curve-secp160r2-tls12-in-tls13]
+ssl_conf = 68-curve-secp160r2-tls12-in-tls13-ssl
-[63-curve-secp160r2-tls12-in-tls13-ssl]
-server = 63-curve-secp160r2-tls12-in-tls13-server
-client = 63-curve-secp160r2-tls12-in-tls13-client
+[68-curve-secp160r2-tls12-in-tls13-ssl]
+server = 68-curve-secp160r2-tls12-in-tls13-server
+client = 68-curve-secp160r2-tls12-in-tls13-client
-[63-curve-secp160r2-tls12-in-tls13-server]
+[68-curve-secp160r2-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160r2:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[63-curve-secp160r2-tls12-in-tls13-client]
+[68-curve-secp160r2-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160r2:P-256
MaxProtocol = TLSv1.3
@@ -1996,7 +2141,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-63]
+[test-68]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2004,21 +2149,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[64-curve-secp192k1-tls12-in-tls13]
-ssl_conf = 64-curve-secp192k1-tls12-in-tls13-ssl
+[69-curve-secp192k1-tls12-in-tls13]
+ssl_conf = 69-curve-secp192k1-tls12-in-tls13-ssl
-[64-curve-secp192k1-tls12-in-tls13-ssl]
-server = 64-curve-secp192k1-tls12-in-tls13-server
-client = 64-curve-secp192k1-tls12-in-tls13-client
+[69-curve-secp192k1-tls12-in-tls13-ssl]
+server = 69-curve-secp192k1-tls12-in-tls13-server
+client = 69-curve-secp192k1-tls12-in-tls13-client
-[64-curve-secp192k1-tls12-in-tls13-server]
+[69-curve-secp192k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp192k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[64-curve-secp192k1-tls12-in-tls13-client]
+[69-curve-secp192k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp192k1:P-256
MaxProtocol = TLSv1.3
@@ -2026,7 +2171,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-64]
+[test-69]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2034,21 +2179,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[65-curve-secp224k1-tls12-in-tls13]
-ssl_conf = 65-curve-secp224k1-tls12-in-tls13-ssl
+[70-curve-secp224k1-tls12-in-tls13]
+ssl_conf = 70-curve-secp224k1-tls12-in-tls13-ssl
-[65-curve-secp224k1-tls12-in-tls13-ssl]
-server = 65-curve-secp224k1-tls12-in-tls13-server
-client = 65-curve-secp224k1-tls12-in-tls13-client
+[70-curve-secp224k1-tls12-in-tls13-ssl]
+server = 70-curve-secp224k1-tls12-in-tls13-server
+client = 70-curve-secp224k1-tls12-in-tls13-client
-[65-curve-secp224k1-tls12-in-tls13-server]
+[70-curve-secp224k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp224k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[65-curve-secp224k1-tls12-in-tls13-client]
+[70-curve-secp224k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp224k1:P-256
MaxProtocol = TLSv1.3
@@ -2056,7 +2201,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-65]
+[test-70]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2064,21 +2209,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[66-curve-secp256k1-tls12-in-tls13]
-ssl_conf = 66-curve-secp256k1-tls12-in-tls13-ssl
+[71-curve-secp256k1-tls12-in-tls13]
+ssl_conf = 71-curve-secp256k1-tls12-in-tls13-ssl
-[66-curve-secp256k1-tls12-in-tls13-ssl]
-server = 66-curve-secp256k1-tls12-in-tls13-server
-client = 66-curve-secp256k1-tls12-in-tls13-client
+[71-curve-secp256k1-tls12-in-tls13-ssl]
+server = 71-curve-secp256k1-tls12-in-tls13-server
+client = 71-curve-secp256k1-tls12-in-tls13-client
-[66-curve-secp256k1-tls12-in-tls13-server]
+[71-curve-secp256k1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp256k1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[66-curve-secp256k1-tls12-in-tls13-client]
+[71-curve-secp256k1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp256k1:P-256
MaxProtocol = TLSv1.3
@@ -2086,7 +2231,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-66]
+[test-71]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2094,21 +2239,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[67-curve-brainpoolP256r1-tls12-in-tls13]
-ssl_conf = 67-curve-brainpoolP256r1-tls12-in-tls13-ssl
+[72-curve-brainpoolP256r1-tls12-in-tls13]
+ssl_conf = 72-curve-brainpoolP256r1-tls12-in-tls13-ssl
-[67-curve-brainpoolP256r1-tls12-in-tls13-ssl]
-server = 67-curve-brainpoolP256r1-tls12-in-tls13-server
-client = 67-curve-brainpoolP256r1-tls12-in-tls13-client
+[72-curve-brainpoolP256r1-tls12-in-tls13-ssl]
+server = 72-curve-brainpoolP256r1-tls12-in-tls13-server
+client = 72-curve-brainpoolP256r1-tls12-in-tls13-client
-[67-curve-brainpoolP256r1-tls12-in-tls13-server]
+[72-curve-brainpoolP256r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP256r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[67-curve-brainpoolP256r1-tls12-in-tls13-client]
+[72-curve-brainpoolP256r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP256r1:P-256
MaxProtocol = TLSv1.3
@@ -2116,7 +2261,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-67]
+[test-72]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2124,21 +2269,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[68-curve-brainpoolP384r1-tls12-in-tls13]
-ssl_conf = 68-curve-brainpoolP384r1-tls12-in-tls13-ssl
+[73-curve-brainpoolP384r1-tls12-in-tls13]
+ssl_conf = 73-curve-brainpoolP384r1-tls12-in-tls13-ssl
-[68-curve-brainpoolP384r1-tls12-in-tls13-ssl]
-server = 68-curve-brainpoolP384r1-tls12-in-tls13-server
-client = 68-curve-brainpoolP384r1-tls12-in-tls13-client
+[73-curve-brainpoolP384r1-tls12-in-tls13-ssl]
+server = 73-curve-brainpoolP384r1-tls12-in-tls13-server
+client = 73-curve-brainpoolP384r1-tls12-in-tls13-client
-[68-curve-brainpoolP384r1-tls12-in-tls13-server]
+[73-curve-brainpoolP384r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP384r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[68-curve-brainpoolP384r1-tls12-in-tls13-client]
+[73-curve-brainpoolP384r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP384r1:P-256
MaxProtocol = TLSv1.3
@@ -2146,7 +2291,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-68]
+[test-73]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2154,21 +2299,21 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[69-curve-brainpoolP512r1-tls12-in-tls13]
-ssl_conf = 69-curve-brainpoolP512r1-tls12-in-tls13-ssl
+[74-curve-brainpoolP512r1-tls12-in-tls13]
+ssl_conf = 74-curve-brainpoolP512r1-tls12-in-tls13-ssl
-[69-curve-brainpoolP512r1-tls12-in-tls13-ssl]
-server = 69-curve-brainpoolP512r1-tls12-in-tls13-server
-client = 69-curve-brainpoolP512r1-tls12-in-tls13-client
+[74-curve-brainpoolP512r1-tls12-in-tls13-ssl]
+server = 74-curve-brainpoolP512r1-tls12-in-tls13-server
+client = 74-curve-brainpoolP512r1-tls12-in-tls13-client
-[69-curve-brainpoolP512r1-tls12-in-tls13-server]
+[74-curve-brainpoolP512r1-tls12-in-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP512r1:P-256
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[69-curve-brainpoolP512r1-tls12-in-tls13-client]
+[74-curve-brainpoolP512r1-tls12-in-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP512r1:P-256
MaxProtocol = TLSv1.3
@@ -2176,7 +2321,7 @@ MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-69]
+[test-74]
ExpectedProtocol = TLSv1.3
ExpectedResult = Success
ExpectedTmpKeyType = P-256
@@ -2184,920 +2329,785 @@ ExpectedTmpKeyType = P-256
# ===========================================================
-[70-curve-sect233k1-tls13]
-ssl_conf = 70-curve-sect233k1-tls13-ssl
+[75-curve-sect233k1-tls13]
+ssl_conf = 75-curve-sect233k1-tls13-ssl
-[70-curve-sect233k1-tls13-ssl]
-server = 70-curve-sect233k1-tls13-server
-client = 70-curve-sect233k1-tls13-client
+[75-curve-sect233k1-tls13-ssl]
+server = 75-curve-sect233k1-tls13-server
+client = 75-curve-sect233k1-tls13-client
-[70-curve-sect233k1-tls13-server]
+[75-curve-sect233k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect233k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[70-curve-sect233k1-tls13-client]
+[75-curve-sect233k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect233k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-70]
+[test-75]
ExpectedResult = ClientFail
# ===========================================================
-[71-curve-sect233r1-tls13]
-ssl_conf = 71-curve-sect233r1-tls13-ssl
+[76-curve-sect233r1-tls13]
+ssl_conf = 76-curve-sect233r1-tls13-ssl
-[71-curve-sect233r1-tls13-ssl]
-server = 71-curve-sect233r1-tls13-server
-client = 71-curve-sect233r1-tls13-client
+[76-curve-sect233r1-tls13-ssl]
+server = 76-curve-sect233r1-tls13-server
+client = 76-curve-sect233r1-tls13-client
-[71-curve-sect233r1-tls13-server]
+[76-curve-sect233r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect233r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[71-curve-sect233r1-tls13-client]
+[76-curve-sect233r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect233r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-71]
+[test-76]
ExpectedResult = ClientFail
# ===========================================================
-[72-curve-sect283k1-tls13]
-ssl_conf = 72-curve-sect283k1-tls13-ssl
+[77-curve-sect283k1-tls13]
+ssl_conf = 77-curve-sect283k1-tls13-ssl
-[72-curve-sect283k1-tls13-ssl]
-server = 72-curve-sect283k1-tls13-server
-client = 72-curve-sect283k1-tls13-client
+[77-curve-sect283k1-tls13-ssl]
+server = 77-curve-sect283k1-tls13-server
+client = 77-curve-sect283k1-tls13-client
-[72-curve-sect283k1-tls13-server]
+[77-curve-sect283k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect283k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[72-curve-sect283k1-tls13-client]
+[77-curve-sect283k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect283k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-72]
+[test-77]
ExpectedResult = ClientFail
# ===========================================================
-[73-curve-sect283r1-tls13]
-ssl_conf = 73-curve-sect283r1-tls13-ssl
+[78-curve-sect283r1-tls13]
+ssl_conf = 78-curve-sect283r1-tls13-ssl
-[73-curve-sect283r1-tls13-ssl]
-server = 73-curve-sect283r1-tls13-server
-client = 73-curve-sect283r1-tls13-client
+[78-curve-sect283r1-tls13-ssl]
+server = 78-curve-sect283r1-tls13-server
+client = 78-curve-sect283r1-tls13-client
-[73-curve-sect283r1-tls13-server]
+[78-curve-sect283r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect283r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[73-curve-sect283r1-tls13-client]
+[78-curve-sect283r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect283r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-73]
+[test-78]
ExpectedResult = ClientFail
# ===========================================================
-[74-curve-sect409k1-tls13]
-ssl_conf = 74-curve-sect409k1-tls13-ssl
+[79-curve-sect409k1-tls13]
+ssl_conf = 79-curve-sect409k1-tls13-ssl
-[74-curve-sect409k1-tls13-ssl]
-server = 74-curve-sect409k1-tls13-server
-client = 74-curve-sect409k1-tls13-client
+[79-curve-sect409k1-tls13-ssl]
+server = 79-curve-sect409k1-tls13-server
+client = 79-curve-sect409k1-tls13-client
-[74-curve-sect409k1-tls13-server]
+[79-curve-sect409k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect409k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[74-curve-sect409k1-tls13-client]
+[79-curve-sect409k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect409k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-74]
+[test-79]
ExpectedResult = ClientFail
# ===========================================================
-[75-curve-sect409r1-tls13]
-ssl_conf = 75-curve-sect409r1-tls13-ssl
+[80-curve-sect409r1-tls13]
+ssl_conf = 80-curve-sect409r1-tls13-ssl
-[75-curve-sect409r1-tls13-ssl]
-server = 75-curve-sect409r1-tls13-server
-client = 75-curve-sect409r1-tls13-client
+[80-curve-sect409r1-tls13-ssl]
+server = 80-curve-sect409r1-tls13-server
+client = 80-curve-sect409r1-tls13-client
-[75-curve-sect409r1-tls13-server]
+[80-curve-sect409r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect409r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[75-curve-sect409r1-tls13-client]
+[80-curve-sect409r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect409r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-75]
+[test-80]
ExpectedResult = ClientFail
# ===========================================================
-[76-curve-sect571k1-tls13]
-ssl_conf = 76-curve-sect571k1-tls13-ssl
+[81-curve-sect571k1-tls13]
+ssl_conf = 81-curve-sect571k1-tls13-ssl
-[76-curve-sect571k1-tls13-ssl]
-server = 76-curve-sect571k1-tls13-server
-client = 76-curve-sect571k1-tls13-client
+[81-curve-sect571k1-tls13-ssl]
+server = 81-curve-sect571k1-tls13-server
+client = 81-curve-sect571k1-tls13-client
-[76-curve-sect571k1-tls13-server]
+[81-curve-sect571k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect571k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[76-curve-sect571k1-tls13-client]
+[81-curve-sect571k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect571k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-76]
+[test-81]
ExpectedResult = ClientFail
# ===========================================================
-[77-curve-sect571r1-tls13]
-ssl_conf = 77-curve-sect571r1-tls13-ssl
+[82-curve-sect571r1-tls13]
+ssl_conf = 82-curve-sect571r1-tls13-ssl
-[77-curve-sect571r1-tls13-ssl]
-server = 77-curve-sect571r1-tls13-server
-client = 77-curve-sect571r1-tls13-client
+[82-curve-sect571r1-tls13-ssl]
+server = 82-curve-sect571r1-tls13-server
+client = 82-curve-sect571r1-tls13-client
-[77-curve-sect571r1-tls13-server]
+[82-curve-sect571r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect571r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[77-curve-sect571r1-tls13-client]
+[82-curve-sect571r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect571r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-77]
+[test-82]
ExpectedResult = ClientFail
# ===========================================================
-[78-curve-secp224r1-tls13]
-ssl_conf = 78-curve-secp224r1-tls13-ssl
+[83-curve-secp224r1-tls13]
+ssl_conf = 83-curve-secp224r1-tls13-ssl
-[78-curve-secp224r1-tls13-ssl]
-server = 78-curve-secp224r1-tls13-server
-client = 78-curve-secp224r1-tls13-client
+[83-curve-secp224r1-tls13-ssl]
+server = 83-curve-secp224r1-tls13-server
+client = 83-curve-secp224r1-tls13-client
-[78-curve-secp224r1-tls13-server]
+[83-curve-secp224r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp224r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[78-curve-secp224r1-tls13-client]
+[83-curve-secp224r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp224r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-78]
+[test-83]
ExpectedResult = ClientFail
# ===========================================================
-[79-curve-sect163k1-tls13]
-ssl_conf = 79-curve-sect163k1-tls13-ssl
+[84-curve-sect163k1-tls13]
+ssl_conf = 84-curve-sect163k1-tls13-ssl
-[79-curve-sect163k1-tls13-ssl]
-server = 79-curve-sect163k1-tls13-server
-client = 79-curve-sect163k1-tls13-client
+[84-curve-sect163k1-tls13-ssl]
+server = 84-curve-sect163k1-tls13-server
+client = 84-curve-sect163k1-tls13-client
-[79-curve-sect163k1-tls13-server]
+[84-curve-sect163k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[79-curve-sect163k1-tls13-client]
+[84-curve-sect163k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-79]
+[test-84]
ExpectedResult = ClientFail
# ===========================================================
-[80-curve-sect163r2-tls13]
-ssl_conf = 80-curve-sect163r2-tls13-ssl
+[85-curve-sect163r2-tls13]
+ssl_conf = 85-curve-sect163r2-tls13-ssl
-[80-curve-sect163r2-tls13-ssl]
-server = 80-curve-sect163r2-tls13-server
-client = 80-curve-sect163r2-tls13-client
+[85-curve-sect163r2-tls13-ssl]
+server = 85-curve-sect163r2-tls13-server
+client = 85-curve-sect163r2-tls13-client
-[80-curve-sect163r2-tls13-server]
+[85-curve-sect163r2-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163r2
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[80-curve-sect163r2-tls13-client]
+[85-curve-sect163r2-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163r2
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-80]
+[test-85]
ExpectedResult = ClientFail
# ===========================================================
-[81-curve-prime192v1-tls13]
-ssl_conf = 81-curve-prime192v1-tls13-ssl
+[86-curve-prime192v1-tls13]
+ssl_conf = 86-curve-prime192v1-tls13-ssl
-[81-curve-prime192v1-tls13-ssl]
-server = 81-curve-prime192v1-tls13-server
-client = 81-curve-prime192v1-tls13-client
+[86-curve-prime192v1-tls13-ssl]
+server = 86-curve-prime192v1-tls13-server
+client = 86-curve-prime192v1-tls13-client
-[81-curve-prime192v1-tls13-server]
+[86-curve-prime192v1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = prime192v1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[81-curve-prime192v1-tls13-client]
+[86-curve-prime192v1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = prime192v1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-81]
+[test-86]
ExpectedResult = ClientFail
# ===========================================================
-[82-curve-sect163r1-tls13]
-ssl_conf = 82-curve-sect163r1-tls13-ssl
+[87-curve-sect163r1-tls13]
+ssl_conf = 87-curve-sect163r1-tls13-ssl
-[82-curve-sect163r1-tls13-ssl]
-server = 82-curve-sect163r1-tls13-server
-client = 82-curve-sect163r1-tls13-client
+[87-curve-sect163r1-tls13-ssl]
+server = 87-curve-sect163r1-tls13-server
+client = 87-curve-sect163r1-tls13-client
-[82-curve-sect163r1-tls13-server]
+[87-curve-sect163r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect163r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[82-curve-sect163r1-tls13-client]
+[87-curve-sect163r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect163r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-82]
+[test-87]
ExpectedResult = ClientFail
# ===========================================================
-[83-curve-sect193r1-tls13]
-ssl_conf = 83-curve-sect193r1-tls13-ssl
+[88-curve-sect193r1-tls13]
+ssl_conf = 88-curve-sect193r1-tls13-ssl
-[83-curve-sect193r1-tls13-ssl]
-server = 83-curve-sect193r1-tls13-server
-client = 83-curve-sect193r1-tls13-client
+[88-curve-sect193r1-tls13-ssl]
+server = 88-curve-sect193r1-tls13-server
+client = 88-curve-sect193r1-tls13-client
-[83-curve-sect193r1-tls13-server]
+[88-curve-sect193r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect193r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[83-curve-sect193r1-tls13-client]
+[88-curve-sect193r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect193r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-83]
+[test-88]
ExpectedResult = ClientFail
# ===========================================================
-[84-curve-sect193r2-tls13]
-ssl_conf = 84-curve-sect193r2-tls13-ssl
+[89-curve-sect193r2-tls13]
+ssl_conf = 89-curve-sect193r2-tls13-ssl
-[84-curve-sect193r2-tls13-ssl]
-server = 84-curve-sect193r2-tls13-server
-client = 84-curve-sect193r2-tls13-client
+[89-curve-sect193r2-tls13-ssl]
+server = 89-curve-sect193r2-tls13-server
+client = 89-curve-sect193r2-tls13-client
-[84-curve-sect193r2-tls13-server]
+[89-curve-sect193r2-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect193r2
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[84-curve-sect193r2-tls13-client]
+[89-curve-sect193r2-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect193r2
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-84]
+[test-89]
ExpectedResult = ClientFail
# ===========================================================
-[85-curve-sect239k1-tls13]
-ssl_conf = 85-curve-sect239k1-tls13-ssl
+[90-curve-sect239k1-tls13]
+ssl_conf = 90-curve-sect239k1-tls13-ssl
-[85-curve-sect239k1-tls13-ssl]
-server = 85-curve-sect239k1-tls13-server
-client = 85-curve-sect239k1-tls13-client
+[90-curve-sect239k1-tls13-ssl]
+server = 90-curve-sect239k1-tls13-server
+client = 90-curve-sect239k1-tls13-client
-[85-curve-sect239k1-tls13-server]
+[90-curve-sect239k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = sect239k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[85-curve-sect239k1-tls13-client]
+[90-curve-sect239k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = sect239k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-85]
+[test-90]
ExpectedResult = ClientFail
# ===========================================================
-[86-curve-secp160k1-tls13]
-ssl_conf = 86-curve-secp160k1-tls13-ssl
+[91-curve-secp160k1-tls13]
+ssl_conf = 91-curve-secp160k1-tls13-ssl
-[86-curve-secp160k1-tls13-ssl]
-server = 86-curve-secp160k1-tls13-server
-client = 86-curve-secp160k1-tls13-client
+[91-curve-secp160k1-tls13-ssl]
+server = 91-curve-secp160k1-tls13-server
+client = 91-curve-secp160k1-tls13-client
-[86-curve-secp160k1-tls13-server]
+[91-curve-secp160k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[86-curve-secp160k1-tls13-client]
+[91-curve-secp160k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-86]
+[test-91]
ExpectedResult = ClientFail
# ===========================================================
-[87-curve-secp160r1-tls13]
-ssl_conf = 87-curve-secp160r1-tls13-ssl
+[92-curve-secp160r1-tls13]
+ssl_conf = 92-curve-secp160r1-tls13-ssl
-[87-curve-secp160r1-tls13-ssl]
-server = 87-curve-secp160r1-tls13-server
-client = 87-curve-secp160r1-tls13-client
+[92-curve-secp160r1-tls13-ssl]
+server = 92-curve-secp160r1-tls13-server
+client = 92-curve-secp160r1-tls13-client
-[87-curve-secp160r1-tls13-server]
+[92-curve-secp160r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[87-curve-secp160r1-tls13-client]
+[92-curve-secp160r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-87]
+[test-92]
ExpectedResult = ClientFail
# ===========================================================
-[88-curve-secp160r2-tls13]
-ssl_conf = 88-curve-secp160r2-tls13-ssl
+[93-curve-secp160r2-tls13]
+ssl_conf = 93-curve-secp160r2-tls13-ssl
-[88-curve-secp160r2-tls13-ssl]
-server = 88-curve-secp160r2-tls13-server
-client = 88-curve-secp160r2-tls13-client
+[93-curve-secp160r2-tls13-ssl]
+server = 93-curve-secp160r2-tls13-server
+client = 93-curve-secp160r2-tls13-client
-[88-curve-secp160r2-tls13-server]
+[93-curve-secp160r2-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp160r2
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[88-curve-secp160r2-tls13-client]
+[93-curve-secp160r2-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp160r2
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-88]
+[test-93]
ExpectedResult = ClientFail
# ===========================================================
-[89-curve-secp192k1-tls13]
-ssl_conf = 89-curve-secp192k1-tls13-ssl
+[94-curve-secp192k1-tls13]
+ssl_conf = 94-curve-secp192k1-tls13-ssl
-[89-curve-secp192k1-tls13-ssl]
-server = 89-curve-secp192k1-tls13-server
-client = 89-curve-secp192k1-tls13-client
+[94-curve-secp192k1-tls13-ssl]
+server = 94-curve-secp192k1-tls13-server
+client = 94-curve-secp192k1-tls13-client
-[89-curve-secp192k1-tls13-server]
+[94-curve-secp192k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp192k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[89-curve-secp192k1-tls13-client]
+[94-curve-secp192k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp192k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-89]
+[test-94]
ExpectedResult = ClientFail
# ===========================================================
-[90-curve-secp224k1-tls13]
-ssl_conf = 90-curve-secp224k1-tls13-ssl
+[95-curve-secp224k1-tls13]
+ssl_conf = 95-curve-secp224k1-tls13-ssl
-[90-curve-secp224k1-tls13-ssl]
-server = 90-curve-secp224k1-tls13-server
-client = 90-curve-secp224k1-tls13-client
+[95-curve-secp224k1-tls13-ssl]
+server = 95-curve-secp224k1-tls13-server
+client = 95-curve-secp224k1-tls13-client
-[90-curve-secp224k1-tls13-server]
+[95-curve-secp224k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp224k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[90-curve-secp224k1-tls13-client]
+[95-curve-secp224k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp224k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-90]
+[test-95]
ExpectedResult = ClientFail
# ===========================================================
-[91-curve-secp256k1-tls13]
-ssl_conf = 91-curve-secp256k1-tls13-ssl
+[96-curve-secp256k1-tls13]
+ssl_conf = 96-curve-secp256k1-tls13-ssl
-[91-curve-secp256k1-tls13-ssl]
-server = 91-curve-secp256k1-tls13-server
-client = 91-curve-secp256k1-tls13-client
+[96-curve-secp256k1-tls13-ssl]
+server = 96-curve-secp256k1-tls13-server
+client = 96-curve-secp256k1-tls13-client
-[91-curve-secp256k1-tls13-server]
+[96-curve-secp256k1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = secp256k1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[91-curve-secp256k1-tls13-client]
+[96-curve-secp256k1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = secp256k1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-91]
+[test-96]
ExpectedResult = ClientFail
# ===========================================================
-[92-curve-brainpoolP256r1-tls13]
-ssl_conf = 92-curve-brainpoolP256r1-tls13-ssl
+[97-curve-brainpoolP256r1-tls13]
+ssl_conf = 97-curve-brainpoolP256r1-tls13-ssl
-[92-curve-brainpoolP256r1-tls13-ssl]
-server = 92-curve-brainpoolP256r1-tls13-server
-client = 92-curve-brainpoolP256r1-tls13-client
+[97-curve-brainpoolP256r1-tls13-ssl]
+server = 97-curve-brainpoolP256r1-tls13-server
+client = 97-curve-brainpoolP256r1-tls13-client
-[92-curve-brainpoolP256r1-tls13-server]
+[97-curve-brainpoolP256r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP256r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[92-curve-brainpoolP256r1-tls13-client]
+[97-curve-brainpoolP256r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP256r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-92]
+[test-97]
ExpectedResult = ClientFail
# ===========================================================
-[93-curve-brainpoolP384r1-tls13]
-ssl_conf = 93-curve-brainpoolP384r1-tls13-ssl
+[98-curve-brainpoolP384r1-tls13]
+ssl_conf = 98-curve-brainpoolP384r1-tls13-ssl
-[93-curve-brainpoolP384r1-tls13-ssl]
-server = 93-curve-brainpoolP384r1-tls13-server
-client = 93-curve-brainpoolP384r1-tls13-client
+[98-curve-brainpoolP384r1-tls13-ssl]
+server = 98-curve-brainpoolP384r1-tls13-server
+client = 98-curve-brainpoolP384r1-tls13-client
-[93-curve-brainpoolP384r1-tls13-server]
+[98-curve-brainpoolP384r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP384r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[93-curve-brainpoolP384r1-tls13-client]
+[98-curve-brainpoolP384r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP384r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-93]
+[test-98]
ExpectedResult = ClientFail
# ===========================================================
-[94-curve-brainpoolP512r1-tls13]
-ssl_conf = 94-curve-brainpoolP512r1-tls13-ssl
+[99-curve-brainpoolP512r1-tls13]
+ssl_conf = 99-curve-brainpoolP512r1-tls13-ssl
-[94-curve-brainpoolP512r1-tls13-ssl]
-server = 94-curve-brainpoolP512r1-tls13-server
-client = 94-curve-brainpoolP512r1-tls13-client
+[99-curve-brainpoolP512r1-tls13-ssl]
+server = 99-curve-brainpoolP512r1-tls13-server
+client = 99-curve-brainpoolP512r1-tls13-client
-[94-curve-brainpoolP512r1-tls13-server]
+[99-curve-brainpoolP512r1-tls13-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = brainpoolP512r1
MaxProtocol = TLSv1.3
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[94-curve-brainpoolP512r1-tls13-client]
+[99-curve-brainpoolP512r1-tls13-client]
CipherString = ECDHE@SECLEVEL=1
Curves = brainpoolP512r1
MinProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-94]
+[test-99]
ExpectedResult = ClientFail
# ===========================================================
-[95-curve-ffdhe2048-tls13-in-tls12]
-ssl_conf = 95-curve-ffdhe2048-tls13-in-tls12-ssl
-
-[95-curve-ffdhe2048-tls13-in-tls12-ssl]
-server = 95-curve-ffdhe2048-tls13-in-tls12-server
-client = 95-curve-ffdhe2048-tls13-in-tls12-client
-
-[95-curve-ffdhe2048-tls13-in-tls12-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT@SECLEVEL=1
-Curves = ffdhe2048
-MaxProtocol = TLSv1.3
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[95-curve-ffdhe2048-tls13-in-tls12-client]
-CipherString = ECDHE@SECLEVEL=1
-Curves = ffdhe2048
-MaxProtocol = TLSv1.2
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
-[test-95]
-ExpectedResult = ServerFail
-
-
-# ===========================================================
-
-[96-curve-ffdhe2048-tls13-in-tls12-2]
-ssl_conf = 96-curve-ffdhe2048-tls13-in-tls12-2-ssl
+[100-curve-ffdhe2048-tls13-in-tls12-2]
+ssl_conf = 100-curve-ffdhe2048-tls13-in-tls12-2-ssl
-[96-curve-ffdhe2048-tls13-in-tls12-2-ssl]
-server = 96-curve-ffdhe2048-tls13-in-tls12-2-server
-client = 96-curve-ffdhe2048-tls13-in-tls12-2-client
+[100-curve-ffdhe2048-tls13-in-tls12-2-ssl]
+server = 100-curve-ffdhe2048-tls13-in-tls12-2-server
+client = 100-curve-ffdhe2048-tls13-in-tls12-2-client
-[96-curve-ffdhe2048-tls13-in-tls12-2-server]
+[100-curve-ffdhe2048-tls13-in-tls12-2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe2048
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[96-curve-ffdhe2048-tls13-in-tls12-2-client]
+[100-curve-ffdhe2048-tls13-in-tls12-2-client]
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe2048
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-96]
+[test-100]
ExpectedResult = Success
# ===========================================================
-[97-curve-ffdhe3072-tls13-in-tls12]
-ssl_conf = 97-curve-ffdhe3072-tls13-in-tls12-ssl
+[101-curve-ffdhe3072-tls13-in-tls12-2]
+ssl_conf = 101-curve-ffdhe3072-tls13-in-tls12-2-ssl
-[97-curve-ffdhe3072-tls13-in-tls12-ssl]
-server = 97-curve-ffdhe3072-tls13-in-tls12-server
-client = 97-curve-ffdhe3072-tls13-in-tls12-client
+[101-curve-ffdhe3072-tls13-in-tls12-2-ssl]
+server = 101-curve-ffdhe3072-tls13-in-tls12-2-server
+client = 101-curve-ffdhe3072-tls13-in-tls12-2-client
-[97-curve-ffdhe3072-tls13-in-tls12-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT@SECLEVEL=1
-Curves = ffdhe3072
-MaxProtocol = TLSv1.3
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[97-curve-ffdhe3072-tls13-in-tls12-client]
-CipherString = ECDHE@SECLEVEL=1
-Curves = ffdhe3072
-MaxProtocol = TLSv1.2
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
-[test-97]
-ExpectedResult = ServerFail
-
-
-# ===========================================================
-
-[98-curve-ffdhe3072-tls13-in-tls12-2]
-ssl_conf = 98-curve-ffdhe3072-tls13-in-tls12-2-ssl
-
-[98-curve-ffdhe3072-tls13-in-tls12-2-ssl]
-server = 98-curve-ffdhe3072-tls13-in-tls12-2-server
-client = 98-curve-ffdhe3072-tls13-in-tls12-2-client
-
-[98-curve-ffdhe3072-tls13-in-tls12-2-server]
+[101-curve-ffdhe3072-tls13-in-tls12-2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe3072
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[98-curve-ffdhe3072-tls13-in-tls12-2-client]
+[101-curve-ffdhe3072-tls13-in-tls12-2-client]
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe3072
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-98]
+[test-101]
ExpectedResult = Success
# ===========================================================
-[99-curve-ffdhe4096-tls13-in-tls12]
-ssl_conf = 99-curve-ffdhe4096-tls13-in-tls12-ssl
+[102-curve-ffdhe4096-tls13-in-tls12-2]
+ssl_conf = 102-curve-ffdhe4096-tls13-in-tls12-2-ssl
-[99-curve-ffdhe4096-tls13-in-tls12-ssl]
-server = 99-curve-ffdhe4096-tls13-in-tls12-server
-client = 99-curve-ffdhe4096-tls13-in-tls12-client
+[102-curve-ffdhe4096-tls13-in-tls12-2-ssl]
+server = 102-curve-ffdhe4096-tls13-in-tls12-2-server
+client = 102-curve-ffdhe4096-tls13-in-tls12-2-client
-[99-curve-ffdhe4096-tls13-in-tls12-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT@SECLEVEL=1
-Curves = ffdhe4096
-MaxProtocol = TLSv1.3
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[99-curve-ffdhe4096-tls13-in-tls12-client]
-CipherString = ECDHE@SECLEVEL=1
-Curves = ffdhe4096
-MaxProtocol = TLSv1.2
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
-[test-99]
-ExpectedResult = ServerFail
-
-
-# ===========================================================
-
-[100-curve-ffdhe4096-tls13-in-tls12-2]
-ssl_conf = 100-curve-ffdhe4096-tls13-in-tls12-2-ssl
-
-[100-curve-ffdhe4096-tls13-in-tls12-2-ssl]
-server = 100-curve-ffdhe4096-tls13-in-tls12-2-server
-client = 100-curve-ffdhe4096-tls13-in-tls12-2-client
-
-[100-curve-ffdhe4096-tls13-in-tls12-2-server]
+[102-curve-ffdhe4096-tls13-in-tls12-2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe4096
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[100-curve-ffdhe4096-tls13-in-tls12-2-client]
+[102-curve-ffdhe4096-tls13-in-tls12-2-client]
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe4096
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-100]
+[test-102]
ExpectedResult = Success
# ===========================================================
-[101-curve-ffdhe6144-tls13-in-tls12]
-ssl_conf = 101-curve-ffdhe6144-tls13-in-tls12-ssl
-
-[101-curve-ffdhe6144-tls13-in-tls12-ssl]
-server = 101-curve-ffdhe6144-tls13-in-tls12-server
-client = 101-curve-ffdhe6144-tls13-in-tls12-client
-
-[101-curve-ffdhe6144-tls13-in-tls12-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT@SECLEVEL=1
-Curves = ffdhe6144
-MaxProtocol = TLSv1.3
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[101-curve-ffdhe6144-tls13-in-tls12-client]
-CipherString = ECDHE@SECLEVEL=1
-Curves = ffdhe6144
-MaxProtocol = TLSv1.2
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
-[test-101]
-ExpectedResult = ServerFail
-
-
-# ===========================================================
-
-[102-curve-ffdhe6144-tls13-in-tls12-2]
-ssl_conf = 102-curve-ffdhe6144-tls13-in-tls12-2-ssl
+[103-curve-ffdhe6144-tls13-in-tls12-2]
+ssl_conf = 103-curve-ffdhe6144-tls13-in-tls12-2-ssl
-[102-curve-ffdhe6144-tls13-in-tls12-2-ssl]
-server = 102-curve-ffdhe6144-tls13-in-tls12-2-server
-client = 102-curve-ffdhe6144-tls13-in-tls12-2-client
+[103-curve-ffdhe6144-tls13-in-tls12-2-ssl]
+server = 103-curve-ffdhe6144-tls13-in-tls12-2-server
+client = 103-curve-ffdhe6144-tls13-in-tls12-2-client
-[102-curve-ffdhe6144-tls13-in-tls12-2-server]
+[103-curve-ffdhe6144-tls13-in-tls12-2-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe6144
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-[102-curve-ffdhe6144-tls13-in-tls12-2-client]
+[103-curve-ffdhe6144-tls13-in-tls12-2-client]
CipherString = DEFAULT@SECLEVEL=1
Curves = ffdhe6144
MaxProtocol = TLSv1.3
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
-[test-102]
-ExpectedResult = Success
-
-
-# ===========================================================
-
-[103-curve-ffdhe8192-tls13-in-tls12]
-ssl_conf = 103-curve-ffdhe8192-tls13-in-tls12-ssl
-
-[103-curve-ffdhe8192-tls13-in-tls12-ssl]
-server = 103-curve-ffdhe8192-tls13-in-tls12-server
-client = 103-curve-ffdhe8192-tls13-in-tls12-client
-
-[103-curve-ffdhe8192-tls13-in-tls12-server]
-Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
-CipherString = DEFAULT@SECLEVEL=1
-Curves = ffdhe8192
-MaxProtocol = TLSv1.3
-PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
-
-[103-curve-ffdhe8192-tls13-in-tls12-client]
-CipherString = ECDHE@SECLEVEL=1
-Curves = ffdhe8192
-MaxProtocol = TLSv1.2
-VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
-VerifyMode = Peer
-
[test-103]
-ExpectedResult = ServerFail
+ExpectedResult = Success
# ===========================================================
diff --git a/test/ssl-tests/14-curves.cnf.in b/test/ssl-tests/14-curves.cnf.in
index f4a564897b..c3cbbecd5a 100644
--- a/test/ssl-tests/14-curves.cnf.in
+++ b/test/ssl-tests/14-curves.cnf.in
@@ -10,39 +10,82 @@ use warnings;
use OpenSSL::Test;
use OpenSSL::Test::Utils;
+# Set in test/generate_ssl_tests.pl:read_config()
our $fips_mode;
our $fips_3_4;
our $fips_3_5;
+our $fips_4_2;
-my @curves = ("prime256v1", "secp384r1", "secp521r1");
+my @curves = qw(
+ prime256v1
+ secp384r1
+ secp521r1
+ ) unless (disabled("ec"));
-my @curves_no_fips = ("X25519", "X448");
+my @curves_no_fips;
+push @curves_no_fips, qw(
+ X25519
+ X448
+ ) unless (disabled("ecx"));
push @curves, @curves_no_fips if !$fips_mode;
+#Curves suitable for for both TLS 1.2 and TLS 1.3
+my @curves_tls = qw(
+ ffdhe2048
+ ffdhe3072
+ ffdhe4096
+ ffdhe6144
+ ffdhe8192
+ ) unless (disabled("dh"));
+
#Curves *only* suitable for use in TLSv1.3
-my @curves_tls_1_3 = ("ffdhe2048", "ffdhe3072", "ffdhe4096", "ffdhe6144",
- "ffdhe8192");
-my @curves_tls_1_3_no_fips = ("brainpoolP256r1tls13", "brainpoolP384r1tls13",
- "brainpoolP512r1tls13");
+my @curves_tls_1_3 = @curves_tls;
+
+my @curves_tls_1_3_no_fips;
+push @curves_tls_1_3_no_fips, qw(
+ brainpoolP256r1tls13
+ brainpoolP384r1tls13
+ brainpoolP512r1tls13
+ ) unless (disabled("ec"));
push @curves_tls_1_3, @curves_tls_1_3_no_fips if !$fips_mode;
push @curves, @curves_tls_1_3;
-my @curves_tls_1_2 = ();
-push @curves_tls_1_2,
- "sect233k1", "sect233r1", "sect283k1", "sect283r1", "sect409k1",
- "sect409r1", "sect571k1", "sect571r1", "secp224r1"
- unless ($fips_3_4 || disabled("tls-deprecated-ec"));
+my @curves_tls_1_2 = @curves_tls;
+push @curves_tls_1_2, qw(
+ sect233k1
+ sect233r1
+ sect283k1
+ sect283r1
+ sect409k1
+ sect409r1
+ sect571k1
+ sect571r1
+ secp224r1
+ ) unless ($fips_3_4 || disabled("tls-deprecated-ec"));
my @curves_non_fips = ();
-push @curves_non_fips,
- "sect163k1", "sect163r2", "prime192v1", "sect163r1", "sect193r1",
- "sect193r2", "sect239k1", "secp160k1", "secp160r1", "secp160r2",
- "secp192k1", "secp224k1", "secp256k1"
- unless disabled("tls-deprecated-ec");
-push @curves_non_fips,
- "brainpoolP256r1", "brainpoolP384r1", "brainpoolP512r1";
+push @curves_non_fips, qw(
+ sect163k1
+ sect163r2
+ prime192v1
+ sect163r1
+ sect193r1
+ sect193r2
+ sect239k1
+ secp160k1
+ secp160r1
+ secp160r2
+ secp192k1
+ secp224k1
+ secp256k1
+ ) unless disabled("tls-deprecated-ec");
+push @curves_non_fips, qw(
+ brainpoolP256r1
+ brainpoolP384r1
+ brainpoolP512r1
+ ) unless (disabled("ec"));
push @curves_tls_1_2, @curves_non_fips if !$fips_mode;
@@ -50,15 +93,15 @@ my @curves_no_nid = ();
push @curves_no_nid, qw(X25519MLKEM768)
unless (disabled("ml-kem") || disabled("ecx") || ($fips_mode && !$fips_3_5));
push @curves_no_nid, qw(SecP256r1MLKEM768 SecP384r1MLKEM1024)
- unless (disabled("ml-kem") || ($fips_mode && !$fips_3_5));
+ unless (disabled("ml-kem") || disabled("ec") || ($fips_mode && !$fips_3_5));
push @curves_no_nid, qw(curveSM2)
- unless ($fips_mode || disabled("sm2"));
+ unless (disabled("sm2") || $fips_mode);
push @curves_no_nid, qw(curveSM2MLKEM768)
- unless ($fips_mode || disabled("sm2") || disabled("ml-kem"));
+ unless (disabled("ml-kem") || disabled("sm2") || $fips_mode);
push @curves_no_nid, qw(MLKEM512X25519)
- unless (disabled("ml-kem") || disabled("ecx") || $fips_mode);
+ unless (disabled("ml-kem") || disabled("ecx") || ($fips_mode && !$fips_4_2));
push @curves_no_nid, qw(SecP256r1MLKEM512)
- unless (disabled("ml-kem") || $fips_mode);
+ unless (disabled("ml-kem") || disabled("ec") || ($fips_mode && !$fips_4_2));
push @curves_tls_1_3, @curves_no_nid;
push @curves, @curves_no_nid;
@@ -81,6 +124,7 @@ sub get_key_type {
sub generate_tests() {
foreach (0..$#curves) {
my $curve = $curves[$_];
+ my $cipher = $curve =~ m{^ffdhe\d+$} ? "DHE" : "ECDHE";
push @tests, {
name => "curve-${curve}",
server => {
@@ -89,12 +133,12 @@ sub generate_tests() {
"MaxProtocol" => "TLSv1.3"
},
client => {
- "CipherString" => 'ECDHE@SECLEVEL=1',
+ "CipherString" => $cipher . '@SECLEVEL=1',
"MaxProtocol" => "TLSv1.3",
"Curves" => $curve
},
test => {
- "ExpectedTmpKeyType" => get_key_type($curve),
+ "ExpectedTmpKeyType" => $curve,
"ExpectedProtocol" => "TLSv1.3",
"ExpectedResult" => "Success"
},
@@ -102,6 +146,7 @@ sub generate_tests() {
}
foreach (0..$#curves_tls_1_2) {
my $curve = $curves_tls_1_2[$_];
+ my $cipher = ($curve =~ m{^ffdhe}) ? "DHE" : "ECDHE";
push @tests, {
name => "curve-${curve}",
server => {
@@ -110,7 +155,7 @@ sub generate_tests() {
"MaxProtocol" => "TLSv1.3"
},
client => {
- "CipherString" => 'ECDHE@SECLEVEL=1',
+ "CipherString" => $cipher . '@SECLEVEL=1',
"MaxProtocol" => "TLSv1.2",
"Curves" => $curve
},
@@ -143,7 +188,7 @@ sub generate_tests() {
"ExpectedProtocol" => "TLSv1.3",
"ExpectedResult" => "Success"
},
- };
+ } unless $curve =~ m{^ffdhe\d+$}; # Valid in both protocols
}
foreach (0..$#curves_tls_1_2) {
my $curve = $curves_tls_1_2[$_];
@@ -162,7 +207,7 @@ sub generate_tests() {
test => {
"ExpectedResult" => "ClientFail"
},
- };
+ } unless $curve =~ m{^ffdhe\d+$}; # Valid in both protocols
}
if (!$fips_3_4) {
foreach (0..$#curves_tls_1_3) {
@@ -185,7 +230,7 @@ sub generate_tests() {
#ECDHE key exchange
"ExpectedResult" => "ServerFail"
},
- };
+ } unless $curve =~ m{^ffdhe\d+$}; # Valid in both protocols
push @tests, {
name => "curve-${curve}-tls13-in-tls12-2",
server => {