mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test mte with stitched ciphersuites in TLSv1.0

Browse Source 
The previous commit fixed a bug with mte, stitched ciphersuites and
TLSv1.0. We now add a test for that scenario.

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12670)
This commit is contained in:
Matt Caswell 2020-08-18 17:25:51 +01:00
parent a361cb841d
commit 8ca6c6669f
2 changed files with 136 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
test/ssl-tests/19-mac-then-encrypt.cnf
View File

@ -1,6 +1,6 @@
# Generated with generate_ssl_tests.pl
num_tests = 6
num_tests = 9
test-0 = 0-disable-encrypt-then-mac-server-sha
test-1 = 1-disable-encrypt-then-mac-client-sha
@ -8,6 +8,9 @@ test-2 = 2-disable-encrypt-then-mac-both-sha
test-3 = 3-disable-encrypt-then-mac-server-sha2
test-4 = 4-disable-encrypt-then-mac-client-sha2
test-5 = 5-disable-encrypt-then-mac-both-sha2
test-6 = 6-disable-encrypt-then-mac-server-sha-tls1
test-7 = 7-disable-encrypt-then-mac-client-sha-tls1
test-8 = 8-disable-encrypt-then-mac-both-sha-tls1
# ===========================================================
[0-disable-encrypt-then-mac-server-sha]
@ -160,3 +163,82 @@ VerifyMode = Peer
ExpectedResult = Success
# ===========================================================
[6-disable-encrypt-then-mac-server-sha-tls1]
ssl_conf = 6-disable-encrypt-then-mac-server-sha-tls1-ssl
[6-disable-encrypt-then-mac-server-sha-tls1-ssl]
server = 6-disable-encrypt-then-mac-server-sha-tls1-server
client = 6-disable-encrypt-then-mac-server-sha-tls1-client
[6-disable-encrypt-then-mac-server-sha-tls1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
Options = -EncryptThenMac
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[6-disable-encrypt-then-mac-server-sha-tls1-client]
CipherString = AES128-SHA@SECLEVEL=0
MaxProtocol = TLSv1
MinProtocol = TLSv1
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-6]
ExpectedResult = Success
# ===========================================================
[7-disable-encrypt-then-mac-client-sha-tls1]
ssl_conf = 7-disable-encrypt-then-mac-client-sha-tls1-ssl
[7-disable-encrypt-then-mac-client-sha-tls1-ssl]
server = 7-disable-encrypt-then-mac-client-sha-tls1-server
client = 7-disable-encrypt-then-mac-client-sha-tls1-client
[7-disable-encrypt-then-mac-client-sha-tls1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[7-disable-encrypt-then-mac-client-sha-tls1-client]
CipherString = AES128-SHA@SECLEVEL=0
MaxProtocol = TLSv1
MinProtocol = TLSv1
Options = -EncryptThenMac
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-7]
ExpectedResult = Success
# ===========================================================
[8-disable-encrypt-then-mac-both-sha-tls1]
ssl_conf = 8-disable-encrypt-then-mac-both-sha-tls1-ssl
[8-disable-encrypt-then-mac-both-sha-tls1-ssl]
server = 8-disable-encrypt-then-mac-both-sha-tls1-server
client = 8-disable-encrypt-then-mac-both-sha-tls1-client
[8-disable-encrypt-then-mac-both-sha-tls1-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
Options = -EncryptThenMac
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[8-disable-encrypt-then-mac-both-sha-tls1-client]
CipherString = AES128-SHA@SECLEVEL=0
MaxProtocol = TLSv1
MinProtocol = TLSv1
Options = -EncryptThenMac
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
[test-8]
ExpectedResult = Success

53
test/ssl-tests/19-mac-then-encrypt.cnf.in
View File

@ -13,6 +13,8 @@ package ssltests;
use OpenSSL::Test::Utils;
our $fips_mode;
our @tests = (
{
name => "disable-encrypt-then-mac-server-sha",
@ -99,4 +101,55 @@ my @tests_tls1_2 = (
},
);
our @tests_tls1 = (
{
name => "disable-encrypt-then-mac-server-sha-tls1",
server => {
"CipherString" => 'DEFAULT:@SECLEVEL=0',
"Options" => "-EncryptThenMac",
},
client => {
"CipherString" => 'AES128-SHA@SECLEVEL=0',
"MinProtocol" => "TLSv1",
"MaxProtocol" => "TLSv1"
},
test => {
"ExpectedResult" => "Success",
},
},
{
name => "disable-encrypt-then-mac-client-sha-tls1",
server => {
"CipherString" => 'DEFAULT:@SECLEVEL=0',
},
client => {
"CipherString" => 'AES128-SHA@SECLEVEL=0',
"Options" => "-EncryptThenMac",
"MinProtocol" => "TLSv1",
"MaxProtocol" => "TLSv1"
},
test => {
"ExpectedResult" => "Success",
},
},
{
name => "disable-encrypt-then-mac-both-sha-tls1",
server => {
"CipherString" => 'DEFAULT:@SECLEVEL=0',
"Options" => "-EncryptThenMac",
},
client => {
"CipherString" => 'AES128-SHA@SECLEVEL=0',
"Options" => "-EncryptThenMac",
"MinProtocol" => "TLSv1",
"MaxProtocol" => "TLSv1"
},
test => {
"ExpectedResult" => "Success",
},
},
);
push @tests, @tests_tls1_2 unless disabled("tls1_2");
push @tests, @tests_tls1 unless disabled("tls1") || $fips_mode;