From 9c4319bd03f17fc87ae63b6231c87c678e5cabd1 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sun, 8 Jan 2017 19:36:20 +0000 Subject: [PATCH] Add server temp key type checks Reviewed-by: Kurt Roeckx Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/2191) --- test/ssl-tests/14-curves.conf | 29 +++++++++++++++++++++++++++++ test/ssl-tests/14-curves.conf.in | 5 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/test/ssl-tests/14-curves.conf b/test/ssl-tests/14-curves.conf index 17d00b58a7..83911b0aef 100644 --- a/test/ssl-tests/14-curves.conf +++ b/test/ssl-tests/14-curves.conf @@ -55,6 +55,7 @@ VerifyMode = Peer [test-0] ExpectedResult = Success +ExpectedTmpKeyType = sect163k1 # =========================================================== @@ -81,6 +82,7 @@ VerifyMode = Peer [test-1] ExpectedResult = Success +ExpectedTmpKeyType = sect163r1 # =========================================================== @@ -107,6 +109,7 @@ VerifyMode = Peer [test-2] ExpectedResult = Success +ExpectedTmpKeyType = sect163r2 # =========================================================== @@ -133,6 +136,7 @@ VerifyMode = Peer [test-3] ExpectedResult = Success +ExpectedTmpKeyType = sect193r1 # =========================================================== @@ -159,6 +163,7 @@ VerifyMode = Peer [test-4] ExpectedResult = Success +ExpectedTmpKeyType = sect193r2 # =========================================================== @@ -185,6 +190,7 @@ VerifyMode = Peer [test-5] ExpectedResult = Success +ExpectedTmpKeyType = sect233k1 # =========================================================== @@ -211,6 +217,7 @@ VerifyMode = Peer [test-6] ExpectedResult = Success +ExpectedTmpKeyType = sect233r1 # =========================================================== @@ -237,6 +244,7 @@ VerifyMode = Peer [test-7] ExpectedResult = Success +ExpectedTmpKeyType = sect239k1 # =========================================================== @@ -263,6 +271,7 @@ VerifyMode = Peer [test-8] ExpectedResult = Success +ExpectedTmpKeyType = sect283k1 # =========================================================== @@ -289,6 +298,7 @@ VerifyMode = Peer [test-9] ExpectedResult = Success +ExpectedTmpKeyType = sect283r1 # =========================================================== @@ -315,6 +325,7 @@ VerifyMode = Peer [test-10] ExpectedResult = Success +ExpectedTmpKeyType = sect409k1 # =========================================================== @@ -341,6 +352,7 @@ VerifyMode = Peer [test-11] ExpectedResult = Success +ExpectedTmpKeyType = sect409r1 # =========================================================== @@ -367,6 +379,7 @@ VerifyMode = Peer [test-12] ExpectedResult = Success +ExpectedTmpKeyType = sect571k1 # =========================================================== @@ -393,6 +406,7 @@ VerifyMode = Peer [test-13] ExpectedResult = Success +ExpectedTmpKeyType = sect571r1 # =========================================================== @@ -419,6 +433,7 @@ VerifyMode = Peer [test-14] ExpectedResult = Success +ExpectedTmpKeyType = secp160k1 # =========================================================== @@ -445,6 +460,7 @@ VerifyMode = Peer [test-15] ExpectedResult = Success +ExpectedTmpKeyType = secp160r1 # =========================================================== @@ -471,6 +487,7 @@ VerifyMode = Peer [test-16] ExpectedResult = Success +ExpectedTmpKeyType = secp160r2 # =========================================================== @@ -497,6 +514,7 @@ VerifyMode = Peer [test-17] ExpectedResult = Success +ExpectedTmpKeyType = secp192k1 # =========================================================== @@ -523,6 +541,7 @@ VerifyMode = Peer [test-18] ExpectedResult = Success +ExpectedTmpKeyType = prime192v1 # =========================================================== @@ -549,6 +568,7 @@ VerifyMode = Peer [test-19] ExpectedResult = Success +ExpectedTmpKeyType = secp224k1 # =========================================================== @@ -575,6 +595,7 @@ VerifyMode = Peer [test-20] ExpectedResult = Success +ExpectedTmpKeyType = secp224r1 # =========================================================== @@ -601,6 +622,7 @@ VerifyMode = Peer [test-21] ExpectedResult = Success +ExpectedTmpKeyType = secp256k1 # =========================================================== @@ -627,6 +649,7 @@ VerifyMode = Peer [test-22] ExpectedResult = Success +ExpectedTmpKeyType = prime256v1 # =========================================================== @@ -653,6 +676,7 @@ VerifyMode = Peer [test-23] ExpectedResult = Success +ExpectedTmpKeyType = secp384r1 # =========================================================== @@ -679,6 +703,7 @@ VerifyMode = Peer [test-24] ExpectedResult = Success +ExpectedTmpKeyType = secp521r1 # =========================================================== @@ -705,6 +730,7 @@ VerifyMode = Peer [test-25] ExpectedResult = Success +ExpectedTmpKeyType = brainpoolP256r1 # =========================================================== @@ -731,6 +757,7 @@ VerifyMode = Peer [test-26] ExpectedResult = Success +ExpectedTmpKeyType = brainpoolP384r1 # =========================================================== @@ -757,6 +784,7 @@ VerifyMode = Peer [test-27] ExpectedResult = Success +ExpectedTmpKeyType = brainpoolP512r1 # =========================================================== @@ -783,5 +811,6 @@ VerifyMode = Peer [test-28] ExpectedResult = Success +ExpectedTmpKeyType = X25519 diff --git a/test/ssl-tests/14-curves.conf.in b/test/ssl-tests/14-curves.conf.in index dec2be210c..6e98b5a69a 100644 --- a/test/ssl-tests/14-curves.conf.in +++ b/test/ssl-tests/14-curves.conf.in @@ -35,7 +35,10 @@ sub generate_tests() { "CipherString" => "ECDHE", "Curves" => $curve }, - test => { "ExpectedResult" => "Success" }, + test => { + "ExpectedTmpKeyType" => $curve, + "ExpectedResult" => "Success" + }, }; } } -- 2.34.1