|
 |
7d1228 |
diff -up openssl-1.1.1d/test/ssl-tests/20-cert-select.conf.in.no-brainpool openssl-1.1.1d/test/ssl-tests/20-cert-select.conf.in
|
|
|
7d1228 |
--- openssl-1.1.1d/test/ssl-tests/20-cert-select.conf.in.no-brainpool 2019-09-10 15:13:07.000000000 +0200
|
|
|
7d1228 |
+++ openssl-1.1.1d/test/ssl-tests/20-cert-select.conf.in 2019-09-13 15:11:07.358687169 +0200
|
|
|
7d1228 |
@@ -147,22 +147,22 @@ our @tests = (
|
|
|
acdedc |
{
|
|
|
acdedc |
name => "ECDSA with brainpool",
|
|
|
acdedc |
server => {
|
|
|
acdedc |
- "Certificate" => test_pem("server-ecdsa-brainpoolP256r1-cert.pem"),
|
|
|
acdedc |
- "PrivateKey" => test_pem("server-ecdsa-brainpoolP256r1-key.pem"),
|
|
|
acdedc |
- "Groups" => "brainpoolP256r1",
|
|
|
7d1228 |
+ "Certificate" => test_pem("server-ecdsa-cert.pem"),
|
|
|
7d1228 |
+ "PrivateKey" => test_pem("server-ecdsa-key.pem"),
|
|
|
acdedc |
+# "Groups" => "brainpoolP256r1",
|
|
|
acdedc |
},
|
|
|
acdedc |
client => {
|
|
|
acdedc |
#We don't restrict this to TLSv1.2, although use of brainpool
|
|
|
acdedc |
#should force this anyway so that this should succeed
|
|
|
acdedc |
"CipherString" => "aECDSA",
|
|
|
acdedc |
"RequestCAFile" => test_pem("root-cert.pem"),
|
|
|
acdedc |
- "Groups" => "brainpoolP256r1",
|
|
|
acdedc |
+# "Groups" => "brainpoolP256r1",
|
|
|
acdedc |
},
|
|
|
acdedc |
test => {
|
|
|
acdedc |
- "ExpectedServerCertType" =>, "brainpoolP256r1",
|
|
|
acdedc |
- "ExpectedServerSignType" =>, "EC",
|
|
|
acdedc |
+# "ExpectedServerCertType" =>, "brainpoolP256r1",
|
|
|
acdedc |
+# "ExpectedServerSignType" =>, "EC",
|
|
|
acdedc |
# Note: certificate_authorities not sent for TLS < 1.3
|
|
|
acdedc |
- "ExpectedServerCANames" =>, "empty",
|
|
|
acdedc |
+# "ExpectedServerCANames" =>, "empty",
|
|
|
acdedc |
"ExpectedResult" => "Success"
|
|
|
acdedc |
},
|
|
|
acdedc |
},
|
|
|
7d1228 |
@@ -853,18 +853,18 @@ my @tests_tls_1_3 = (
|
|
|
acdedc |
{
|
|
|
acdedc |
name => "TLS 1.3 ECDSA with brainpool",
|
|
|
acdedc |
server => {
|
|
|
acdedc |
- "Certificate" => test_pem("server-ecdsa-brainpoolP256r1-cert.pem"),
|
|
|
acdedc |
- "PrivateKey" => test_pem("server-ecdsa-brainpoolP256r1-key.pem"),
|
|
|
acdedc |
- "Groups" => "brainpoolP256r1",
|
|
|
7d1228 |
+ "Certificate" => test_pem("server-ecdsa-cert.pem"),
|
|
|
7d1228 |
+ "PrivateKey" => test_pem("server-ecdsa-key.pem"),
|
|
|
acdedc |
+# "Groups" => "brainpoolP256r1",
|
|
|
acdedc |
},
|
|
|
acdedc |
client => {
|
|
|
acdedc |
"RequestCAFile" => test_pem("root-cert.pem"),
|
|
|
acdedc |
- "Groups" => "brainpoolP256r1",
|
|
|
acdedc |
+# "Groups" => "brainpoolP256r1",
|
|
|
acdedc |
"MinProtocol" => "TLSv1.3",
|
|
|
acdedc |
"MaxProtocol" => "TLSv1.3"
|
|
|
acdedc |
},
|
|
|
acdedc |
test => {
|
|
|
acdedc |
- "ExpectedResult" => "ServerFail"
|
|
|
acdedc |
+ "ExpectedResult" => "Success"
|
|
|
acdedc |
},
|
|
|
acdedc |
},
|
|
|
acdedc |
);
|
|
|
7d1228 |
diff -up openssl-1.1.1d/test/ssl-tests/20-cert-select.conf.no-brainpool openssl-1.1.1d/test/ssl-tests/20-cert-select.conf
|
|
|
7d1228 |
--- openssl-1.1.1d/test/ssl-tests/20-cert-select.conf.no-brainpool 2019-09-10 15:13:07.000000000 +0200
|
|
|
7d1228 |
+++ openssl-1.1.1d/test/ssl-tests/20-cert-select.conf 2019-09-13 15:12:27.380288469 +0200
|
|
|
7d1228 |
@@ -238,23 +238,18 @@ server = 5-ECDSA with brainpool-server
|
|
|
acdedc |
client = 5-ECDSA with brainpool-client
|
|
|
acdedc |
|
|
|
acdedc |
[5-ECDSA with brainpool-server]
|
|
|
acdedc |
-Certificate = ${ENV::TEST_CERTS_DIR}/server-ecdsa-brainpoolP256r1-cert.pem
|
|
|
7d1228 |
+Certificate = ${ENV::TEST_CERTS_DIR}/server-ecdsa-cert.pem
|
|
|
7d1228 |
CipherString = DEFAULT
|
|
|
acdedc |
-Groups = brainpoolP256r1
|
|
|
acdedc |
-PrivateKey = ${ENV::TEST_CERTS_DIR}/server-ecdsa-brainpoolP256r1-key.pem
|
|
|
7d1228 |
+PrivateKey = ${ENV::TEST_CERTS_DIR}/server-ecdsa-key.pem
|
|
|
acdedc |
|
|
|
acdedc |
[5-ECDSA with brainpool-client]
|
|
|
acdedc |
CipherString = aECDSA
|
|
|
acdedc |
-Groups = brainpoolP256r1
|
|
|
acdedc |
RequestCAFile = ${ENV::TEST_CERTS_DIR}/root-cert.pem
|
|
|
acdedc |
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
|
|
|
acdedc |
VerifyMode = Peer
|
|
|
acdedc |
|
|
|
acdedc |
[test-5]
|
|
|
acdedc |
ExpectedResult = Success
|
|
|
acdedc |
-ExpectedServerCANames = empty
|
|
|
acdedc |
-ExpectedServerCertType = brainpoolP256r1
|
|
|
acdedc |
-ExpectedServerSignType = EC
|
|
|
acdedc |
|
|
|
acdedc |
|
|
|
acdedc |
# ===========================================================
|
|
|
7d1228 |
@@ -1713,14 +1708,12 @@ server = 52-TLS 1.3 ECDSA with brainpool
|
|
|
7d1228 |
client = 52-TLS 1.3 ECDSA with brainpool-client
|
|
|
acdedc |
|
|
|
7d1228 |
[52-TLS 1.3 ECDSA with brainpool-server]
|
|
|
acdedc |
-Certificate = ${ENV::TEST_CERTS_DIR}/server-ecdsa-brainpoolP256r1-cert.pem
|
|
|
7d1228 |
+Certificate = ${ENV::TEST_CERTS_DIR}/server-ecdsa-cert.pem
|
|
|
7d1228 |
CipherString = DEFAULT
|
|
|
acdedc |
-Groups = brainpoolP256r1
|
|
|
acdedc |
-PrivateKey = ${ENV::TEST_CERTS_DIR}/server-ecdsa-brainpoolP256r1-key.pem
|
|
|
7d1228 |
+PrivateKey = ${ENV::TEST_CERTS_DIR}/server-ecdsa-key.pem
|
|
|
acdedc |
|
|
|
7d1228 |
[52-TLS 1.3 ECDSA with brainpool-client]
|
|
|
acdedc |
CipherString = DEFAULT
|
|
|
acdedc |
-Groups = brainpoolP256r1
|
|
|
acdedc |
MaxProtocol = TLSv1.3
|
|
|
acdedc |
MinProtocol = TLSv1.3
|
|
|
acdedc |
RequestCAFile = ${ENV::TEST_CERTS_DIR}/root-cert.pem
|
|
|
7d1228 |
@@ -1728,7 +1721,7 @@ VerifyCAFile = ${ENV::TEST_CERTS_DIR}/ro
|
|
|
acdedc |
VerifyMode = Peer
|
|
|
acdedc |
|
|
|
7d1228 |
[test-52]
|
|
|
acdedc |
-ExpectedResult = ServerFail
|
|
|
acdedc |
+ExpectedResult = Success
|
|
|
acdedc |
|
|
|
acdedc |
|
|
|
acdedc |
# ===========================================================
|