Latest update

2018-11-15 23:57:01 +09:00
parent 11ee7ab640
commit dc80102685
24 changed files with 736 additions and 73 deletions
@@ -10,6 +10,7 @@
 ## SSL test configurations

 package ssltests;
+use OpenSSL::Test::Utils;

 our @tests = (
    {
@@ -18,6 +19,9 @@ our @tests = (
        client => { },
        test   => { "ExpectedResult" => "ServerFail" },
    },
+);
+
+our @tests_ec = (
    {
        name => "SECLEVEL 3 with ED448 key",
        server => { "CipherString" => "DEFAULT:\@SECLEVEL=3",
@@ -26,15 +30,6 @@ our @tests = (
        client => { },
        test   => { "ExpectedResult" => "Success" },
    },
-    {
-        name => "SECLEVEL 3 with ED448 key, TLSv1.2",
-        server => { "CipherString" => "DEFAULT:\@SECLEVEL=3",
-                    "Certificate" => test_pem("server-ed448-cert.pem"),
-                    "PrivateKey" => test_pem("server-ed448-key.pem"),
-                    "MaxProtocol" => "TLSv1.2" },
-        client => { },
-        test   => { "ExpectedResult" => "Success" },
-    },
    {
        name => "SECLEVEL 3 with P-384 key, X25519 ECDHE",
        server => { "CipherString" => "DEFAULT:\@SECLEVEL=3",
@@ -46,3 +41,18 @@ our @tests = (
        test   => { "ExpectedResult" => "Success" },
    },
 );
+
+our @tests_tls1_2 = (
+    {
+        name => "SECLEVEL 3 with ED448 key, TLSv1.2",
+        server => { "CipherString" => "DEFAULT:\@SECLEVEL=3",
+                    "Certificate" => test_pem("server-ed448-cert.pem"),
+                    "PrivateKey" => test_pem("server-ed448-key.pem"),
+                    "MaxProtocol" => "TLSv1.2" },
+        client => { },
+        test   => { "ExpectedResult" => "Success" },
+    },
+);
+
+push @tests, @tests_ec unless disabled("ec");
+push @tests, @tests_tls1_2 unless disabled("tls1_2") || disabled("ec");