Commit 1702df6e authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add server temp key type checks 



Reviewed-by: default avatarKurt Roeckx <kurt@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2191)
(cherry picked from commit 9c4319bd)
parent 0c0ead5c

test/ssl-tests/14-curves.conf

+29 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ VerifyMode = Peer 


[test-0]

ExpectedResult = Success

ExpectedTmpKeyType = sect163k1





# ===========================================================
@@ -79,6 +80,7 @@ VerifyMode = Peer 


[test-1]

ExpectedResult = Success

ExpectedTmpKeyType = sect163r1





# ===========================================================
@@ -104,6 +106,7 @@ VerifyMode = Peer 


[test-2]

ExpectedResult = Success

ExpectedTmpKeyType = sect163r2





# ===========================================================
@@ -129,6 +132,7 @@ VerifyMode = Peer 


[test-3]

ExpectedResult = Success

ExpectedTmpKeyType = sect193r1





# ===========================================================
@@ -154,6 +158,7 @@ VerifyMode = Peer 


[test-4]

ExpectedResult = Success

ExpectedTmpKeyType = sect193r2





# ===========================================================
@@ -179,6 +184,7 @@ VerifyMode = Peer 


[test-5]

ExpectedResult = Success

ExpectedTmpKeyType = sect233k1





# ===========================================================
@@ -204,6 +210,7 @@ VerifyMode = Peer 


[test-6]

ExpectedResult = Success

ExpectedTmpKeyType = sect233r1





# ===========================================================
@@ -229,6 +236,7 @@ VerifyMode = Peer 


[test-7]

ExpectedResult = Success

ExpectedTmpKeyType = sect239k1





# ===========================================================
@@ -254,6 +262,7 @@ VerifyMode = Peer 


[test-8]

ExpectedResult = Success

ExpectedTmpKeyType = sect283k1





# ===========================================================
@@ -279,6 +288,7 @@ VerifyMode = Peer 


[test-9]

ExpectedResult = Success

ExpectedTmpKeyType = sect283r1





# ===========================================================
@@ -304,6 +314,7 @@ VerifyMode = Peer 


[test-10]

ExpectedResult = Success

ExpectedTmpKeyType = sect409k1





# ===========================================================
@@ -329,6 +340,7 @@ VerifyMode = Peer 


[test-11]

ExpectedResult = Success

ExpectedTmpKeyType = sect409r1





# ===========================================================
@@ -354,6 +366,7 @@ VerifyMode = Peer 


[test-12]

ExpectedResult = Success

ExpectedTmpKeyType = sect571k1





# ===========================================================
@@ -379,6 +392,7 @@ VerifyMode = Peer 


[test-13]

ExpectedResult = Success

ExpectedTmpKeyType = sect571r1





# ===========================================================
@@ -404,6 +418,7 @@ VerifyMode = Peer 


[test-14]

ExpectedResult = Success

ExpectedTmpKeyType = secp160k1





# ===========================================================
@@ -429,6 +444,7 @@ VerifyMode = Peer 


[test-15]

ExpectedResult = Success

ExpectedTmpKeyType = secp160r1





# ===========================================================
@@ -454,6 +470,7 @@ VerifyMode = Peer 


[test-16]

ExpectedResult = Success

ExpectedTmpKeyType = secp160r2





# ===========================================================
@@ -479,6 +496,7 @@ VerifyMode = Peer 


[test-17]

ExpectedResult = Success

ExpectedTmpKeyType = secp192k1





# ===========================================================
@@ -504,6 +522,7 @@ VerifyMode = Peer 


[test-18]

ExpectedResult = Success

ExpectedTmpKeyType = prime192v1





# ===========================================================
@@ -529,6 +548,7 @@ VerifyMode = Peer 


[test-19]

ExpectedResult = Success

ExpectedTmpKeyType = secp224k1





# ===========================================================
@@ -554,6 +574,7 @@ VerifyMode = Peer 


[test-20]

ExpectedResult = Success

ExpectedTmpKeyType = secp224r1





# ===========================================================
@@ -579,6 +600,7 @@ VerifyMode = Peer 


[test-21]

ExpectedResult = Success

ExpectedTmpKeyType = secp256k1





# ===========================================================
@@ -604,6 +626,7 @@ VerifyMode = Peer 


[test-22]

ExpectedResult = Success

ExpectedTmpKeyType = prime256v1





# ===========================================================
@@ -629,6 +652,7 @@ VerifyMode = Peer 


[test-23]

ExpectedResult = Success

ExpectedTmpKeyType = secp384r1





# ===========================================================
@@ -654,6 +678,7 @@ VerifyMode = Peer 


[test-24]

ExpectedResult = Success

ExpectedTmpKeyType = secp521r1





# ===========================================================
@@ -679,6 +704,7 @@ VerifyMode = Peer 


[test-25]

ExpectedResult = Success

ExpectedTmpKeyType = brainpoolP256r1





# ===========================================================
@@ -704,6 +730,7 @@ VerifyMode = Peer 


[test-26]

ExpectedResult = Success

ExpectedTmpKeyType = brainpoolP384r1





# ===========================================================
@@ -729,6 +756,7 @@ VerifyMode = Peer 


[test-27]

ExpectedResult = Success

ExpectedTmpKeyType = brainpoolP512r1





# ===========================================================
@@ -754,5 +782,6 @@ VerifyMode = Peer 


[test-28]

ExpectedResult = Success

ExpectedTmpKeyType = X25519

test/ssl-tests/14-curves.conf.in

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ sub generate_tests() { 
		"CipherString" => "ECDHE",

                "Curves" => $curve

            },

            test   => { "ExpectedResult" => "Success" },

            test   => {

                "ExpectedTmpKeyType" => $curve,

                "ExpectedResult" => "Success"

            },

        };

    }

}