mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set max protocol version for dtls renegotiation tests to dtls1.2

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23168)
This commit is contained in:
Frederik Wedel-Heinen 2023-12-29 22:52:50 +01:00 committed by Tomas Mraz
parent d8fa4cf763
commit 59b5950589
2 changed files with 18 additions and 0 deletions

9
test/ssl-tests/18-dtls-renegotiate.cnf

@ -23,6 +23,7 @@ client = 0-renegotiate-client-no-resume-client
[0-renegotiate-client-no-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
MaxProtocol = DTLSv1.2
Options = NoResumptionOnRenegotiation
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
@ -51,6 +52,7 @@ client = 1-renegotiate-client-resume-client
[1-renegotiate-client-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
MaxProtocol = DTLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[1-renegotiate-client-resume-client]
@ -78,6 +80,7 @@ client = 2-renegotiate-server-resume-client
[2-renegotiate-server-resume-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
MaxProtocol = DTLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[2-renegotiate-server-resume-client]
@ -105,6 +108,7 @@ client = 3-renegotiate-client-auth-require-client
[3-renegotiate-client-auth-require-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
MaxProtocol = DTLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/root-cert.pem
VerifyMode = Require
@ -136,6 +140,7 @@ client = 4-renegotiate-client-auth-once-client
[4-renegotiate-client-auth-once-server]
Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem
CipherString = DEFAULT:@SECLEVEL=0
MaxProtocol = DTLSv1.2
PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/root-cert.pem
VerifyMode = Once
@ -172,6 +177,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[5-renegotiate-aead-to-non-aead-client]
CipherString = AES128-GCM-SHA256
MaxProtocol = DTLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
@ -204,6 +210,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[6-renegotiate-non-aead-to-aead-client]
CipherString = AES128-SHA
MaxProtocol = DTLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
@ -236,6 +243,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[7-renegotiate-non-aead-to-non-aead-client]
CipherString = AES128-SHA
MaxProtocol = DTLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer
@ -268,6 +276,7 @@ PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem
[8-renegotiate-aead-to-aead-client]
CipherString = AES128-GCM-SHA256
MaxProtocol = DTLSv1.2
VerifyCAFile = ${ENV::TEST_CERTS_DIR}/rootcert.pem
VerifyMode = Peer

9
test/ssl-tests/18-dtls-renegotiate.cnf.in

@ -29,6 +29,7 @@ foreach my $sctp ("No", "Yes")
{
name => "renegotiate-client-no-resume".$suffix,
server => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => 'DEFAULT:@SECLEVEL=0',
"Options" => "NoResumptionOnRenegotiation"
},
@ -46,6 +47,7 @@ foreach my $sctp ("No", "Yes")
{
name => "renegotiate-client-resume".$suffix,
server => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => 'DEFAULT:@SECLEVEL=0'
},
client => {
@ -71,6 +73,7 @@ foreach my $sctp ("No", "Yes")
{
name => "renegotiate-server-resume".$suffix,
server => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => 'DEFAULT:@SECLEVEL=0'
},
client => {
@ -87,6 +90,7 @@ foreach my $sctp ("No", "Yes")
{
name => "renegotiate-client-auth-require".$suffix,
server => {
"MaxProtocol" => "DTLSv1.2",
"VerifyCAFile" => test_pem("root-cert.pem"),
"VerifyMode" => "Require",
"CipherString" => 'DEFAULT:@SECLEVEL=0'
@ -107,6 +111,7 @@ foreach my $sctp ("No", "Yes")
{
name => "renegotiate-client-auth-once".$suffix,
server => {
"MaxProtocol" => "DTLSv1.2",
"VerifyCAFile" => test_pem("root-cert.pem"),
"VerifyMode" => "Once",
"CipherString" => 'DEFAULT:@SECLEVEL=0'
@ -135,6 +140,7 @@ foreach my $sctp ("No", "Yes")
"Options" => "NoResumptionOnRenegotiation"
},
client => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => "AES128-GCM-SHA256",
extra => {
"RenegotiateCiphers" => "AES128-SHA"
@ -154,6 +160,7 @@ foreach my $sctp ("No", "Yes")
"Options" => "NoResumptionOnRenegotiation"
},
client => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => "AES128-SHA",
extra => {
"RenegotiateCiphers" => "AES128-GCM-SHA256"
@ -173,6 +180,7 @@ foreach my $sctp ("No", "Yes")
"Options" => "NoResumptionOnRenegotiation"
},
client => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => "AES128-SHA",
extra => {
"RenegotiateCiphers" => "AES256-SHA"
@ -192,6 +200,7 @@ foreach my $sctp ("No", "Yes")
"Options" => "NoResumptionOnRenegotiation"
},
client => {
"MaxProtocol" => "DTLSv1.2",
"CipherString" => "AES128-GCM-SHA256",
extra => {
"RenegotiateCiphers" => "AES256-GCM-SHA384"