wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Suite B tests

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2738)
This commit is contained in:
Dr. Stephen Henson 2017-02-24 15:47:54 +00:00
parent d343c30e42
commit 9f577cddf9
2 changed files with 110 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
test/ssl-tests/20-cert-select.conf
View file

@ -1,6 +1,6 @@
# Generated with generate_ssl_tests.pl
num_tests = 9
num_tests = 11
test-0 = 0-ECDSA CipherString Selection
test-1 = 1-RSA CipherString Selection
@ -10,7 +10,9 @@ test-4 = 4-ECDSA Signature Algorithm Selection SHA384
test-5 = 5-ECDSA Signature Algorithm Selection, no ECDSA certificate
test-6 = 6-RSA Signature Algorithm Selection
test-7 = 7-RSA-PSS Signature Algorithm Selection
test-8 = 8-TLS 1.2 DSA Certificate Test
test-8 = 8-Suite B P-256 Hash Algorithm Selection
test-9 = 9-Suite B P-384 Hash Algorithm Selection
test-10 = 10-TLS 1.2 DSA Certificate Test
# ===========================================================
[0-ECDSA CipherString Selection]
@ -238,14 +240,74 @@ ExpectedServerSignType = RSA-PSS
# ===========================================================
[8-TLS 1.2 DSA Certificate Test]
ssl_conf = 8-TLS 1.2 DSA Certificate Test-ssl
[8-Suite B P-256 Hash Algorithm Selection]
ssl_conf = 8-Suite B P-256 Hash Algorithm Selection-ssl
[8-TLS 1.2 DSA Certificate Test-ssl]
server = 8-TLS 1.2 DSA Certificate Test-server
client = 8-TLS 1.2 DSA Certificate Test-client
[8-Suite B P-256 Hash Algorithm Selection-ssl]
server = 8-Suite B P-256 Hash Algorithm Selection-server
client = 8-Suite B P-256 Hash Algorithm Selection-client
[8-TLS 1.2 DSA Certificate Test-server]
[8-Suite B P-256 Hash Algorithm Selection-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = SUITEB128
ECDSA.Certificate = ${ENV::TEST_CERTS_DIR}/p256-server-cert.pem
ECDSA.PrivateKey = ${ENV::TEST_CERTS_DIR}/p256-server-key.pem
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[8-Suite B P-256 Hash Algorithm Selection-client]
CipherString = DEFAULT
SignatureAlgorithms = ECDSA+SHA384:ECDSA+SHA256
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/p384-root.pem
VerifyMode = Peer
[test-8]
ExpectedResult = Success
ExpectedServerCertType = P-256
ExpectedServerSignHash = SHA256
ExpectedServerSignType = EC
# ===========================================================
[9-Suite B P-384 Hash Algorithm Selection]
ssl_conf = 9-Suite B P-384 Hash Algorithm Selection-ssl
[9-Suite B P-384 Hash Algorithm Selection-ssl]
server = 9-Suite B P-384 Hash Algorithm Selection-server
client = 9-Suite B P-384 Hash Algorithm Selection-client
[9-Suite B P-384 Hash Algorithm Selection-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = SUITEB128
ECDSA.Certificate = ${ENV::TEST_CERTS_DIR}/p384-server-cert.pem
ECDSA.PrivateKey = ${ENV::TEST_CERTS_DIR}/p384-server-key.pem
MaxProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[9-Suite B P-384 Hash Algorithm Selection-client]
CipherString = DEFAULT
SignatureAlgorithms = ECDSA+SHA256:ECDSA+SHA384
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/p384-root.pem
VerifyMode = Peer
[test-9]
ExpectedResult = Success
ExpectedServerCertType = P-384
ExpectedServerSignHash = SHA384
ExpectedServerSignType = EC
# ===========================================================
[10-TLS 1.2 DSA Certificate Test]
ssl_conf = 10-TLS 1.2 DSA Certificate Test-ssl
[10-TLS 1.2 DSA Certificate Test-ssl]
server = 10-TLS 1.2 DSA Certificate Test-server
client = 10-TLS 1.2 DSA Certificate Test-client
[10-TLS 1.2 DSA Certificate Test-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = ALL
DHParameters = ${ENV::TEST_CERTS_DIR}/dhp2048.pem
@ -255,13 +317,13 @@ MaxProtocol = TLSv1.2
MinProtocol = TLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[8-TLS 1.2 DSA Certificate Test-client]
[10-TLS 1.2 DSA Certificate Test-client]
CipherString = ALL
SignatureAlgorithms = DSA+SHA256:DSA+SHA1
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
[test-10]
ExpectedResult = Success

38
test/ssl-tests/20-cert-select.conf.in
View file

@ -115,6 +115,44 @@ our @tests = (
"ExpectedServerSignType" => "RSA-PSS",
"ExpectedResult" => "Success"
},
},
{
name => "Suite B P-256 Hash Algorithm Selection",
server => {
"ECDSA.Certificate" => test_pem("p256-server-cert.pem"),
"ECDSA.PrivateKey" => test_pem("p256-server-key.pem"),
"MaxProtocol" => "TLSv1.2",
"CipherString" => "SUITEB128"
},
client => {
"VerifyCAFile" => test_pem("p384-root.pem"),
"SignatureAlgorithms" => "ECDSA+SHA384:ECDSA+SHA256"
},
test => {
"ExpectedServerCertType" => "P-256",
"ExpectedServerSignHash" => "SHA256",
"ExpectedServerSignType" => "EC",
"ExpectedResult" => "Success"
},
},
{
name => "Suite B P-384 Hash Algorithm Selection",
server => {
"ECDSA.Certificate" => test_pem("p384-server-cert.pem"),
"ECDSA.PrivateKey" => test_pem("p384-server-key.pem"),
"MaxProtocol" => "TLSv1.2",
"CipherString" => "SUITEB128"
},
client => {
"VerifyCAFile" => test_pem("p384-root.pem"),
"SignatureAlgorithms" => "ECDSA+SHA256:ECDSA+SHA384"
},
test => {
"ExpectedServerCertType" => "P-384",
"ExpectedServerSignHash" => "SHA384",
"ExpectedServerSignType" => "EC",
"ExpectedResult" => "Success"
},
}
);