Commit 0e2c7b3e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add missing MinProtocol/MaxProtocol 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2339)
parent 53f08737

test/ssl-tests/20-cert-select.conf

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ client = 2-ECDSA CipherString Selection, no ECDSA certificate-client 
[2-ECDSA CipherString Selection, no ECDSA certificate-server]

Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem

CipherString = DEFAULT

MaxProtocol = TLSv1.2

PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem



[2-ECDSA CipherString Selection, no ECDSA certificate-client]
@@ -161,6 +162,7 @@ client = 5-ECDSA Signature Algorithm Selection, no ECDSA certificate-client 
[5-ECDSA Signature Algorithm Selection, no ECDSA certificate-server]

Certificate = ${ENV::TEST_CERTS_DIR}/servercert.pem

CipherString = DEFAULT

MaxProtocol = TLSv1.2

PrivateKey = ${ENV::TEST_CERTS_DIR}/serverkey.pem



[5-ECDSA Signature Algorithm Selection, no ECDSA certificate-client]

test/ssl-tests/20-cert-select.conf.in

+10 −3
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ our @tests = ( 
    },

    {

        name => "ECDSA CipherString Selection, no ECDSA certificate",

        server => { },

        server => {

            "MaxProtocol" => "TLSv1.2"

        },

        client => {

            "CipherString" => "aECDSA"

        },
@@ -80,7 +82,9 @@ our @tests = ( 
    },

    {

        name => "ECDSA Signature Algorithm Selection, no ECDSA certificate",

        server => { },

        server => {

             "MaxProtocol" => "TLSv1.2"

        },

        client => {

            "SignatureAlgorithms" => "ECDSA+SHA256",

        },
@@ -166,7 +170,10 @@ my @tests_tls_1_3 = ( 
    },

    {

        name => "TLS 1.3 ECDSA Signature Algorithm Selection, no ECDSA certificate",

        server => { },

        server => {

            "MinProtocol" => "TLSv1.3",

            "MaxProtocol" => "TLSv1.3"

        },

        client => {

            "SignatureAlgorithms" => "ECDSA+SHA256",

        },