X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=test%2Fssl-tests%2F12-ct.conf.in;h=7c0304995ff9b580db568c301ada9cdd93243d73;hb=02a3ed5a95ca0cb9f5173343dc10739a354713ac;hp=9964d013c27bca6b240830afe619e4c18d23ed12;hpb=da085d273c6f2a82f3e13dc6482e0f00e0daab5b;p=oweals%2Fopenssl.git

diff --git a/test/ssl-tests/12-ct.conf.in b/test/ssl-tests/12-ct.conf.in
index 9964d013c2..7c0304995f 100644
--- a/test/ssl-tests/12-ct.conf.in
+++ b/test/ssl-tests/12-ct.conf.in
@@ -16,65 +16,104 @@ package ssltests;
 
 
 our @tests = (
-    # Currently only have tests for certs without SCTs.
     {
-	name => "ct-permissive",
-	server => { },
-	client => {
-     	    extra => {
-	        "CTValidation" => "Permissive",
-	    },
-	},
-	test => {
-	    "ExpectedResult" => "Success",
-	},
-    }, 
+        name => "ct-permissive-without-scts",
+        server => { },
+        client => {
+            extra => {
+                "CTValidation" => "Permissive",
+            },
+        },
+        test => {
+            "ExpectedResult" => "Success",
+        },
+    },
+    {
+        name => "ct-permissive-with-scts",
+        server => {
+            "Certificate" => test_pem("embeddedSCTs1.pem"),
+            "PrivateKey"  => test_pem("embeddedSCTs1-key.pem"),
+        },
+        client => {
+            "VerifyCAFile" => test_pem("embeddedSCTs1_issuer.pem"),
+            extra => {
+                "CTValidation" => "Permissive",
+            },
+        },
+        test => {
+            "ExpectedResult" => "Success",
+        },
+    },
     {
-	name => "ct-strict",
-	server => { },
-	client => {
-     	    extra => {
-	        "CTValidation" => "Strict",
-	    },
-	},
-	test => {
-	    "ExpectedResult" => "ClientFail",
-	    "ExpectedClientAlert" => "HandshakeFailure",
-	},
+        name => "ct-strict-without-scts",
+        server => { },
+        client => {
+            extra => {
+                "CTValidation" => "Strict",
+            },
+        },
+        test => {
+            "ExpectedResult" => "ClientFail",
+            "ExpectedClientAlert" => "HandshakeFailure",
+        },
     },
     {
-	name => "ct-permissive-resumption",
-	server => { },
-	client => {
-     	    extra => {
-	        "CTValidation" => "Permissive",
-	    },
-	},
-	test => {
-	    "HandshakeMode" => "Resume",
-	    "ResumptionExpected" => "Yes",
-	    "ExpectedResult" => "Success",
-	},
-    }, 
+        name => "ct-strict-with-scts",
+        server => {
+            "Certificate" => test_pem("embeddedSCTs1.pem"),
+            "PrivateKey"  => test_pem("embeddedSCTs1-key.pem"),
+        },
+        client => {
+            "VerifyCAFile" => test_pem("embeddedSCTs1_issuer.pem"),
+            extra => {
+                "CTValidation" => "Strict",
+            },
+        },
+        test => {
+            "ExpectedResult" => "Success",
+        },
+    },
+    {
+        name => "ct-permissive-resumption",
+        server => {
+            "Certificate" => test_pem("embeddedSCTs1.pem"),
+            "PrivateKey"  => test_pem("embeddedSCTs1-key.pem"),
+        },
+        client => {
+            "VerifyCAFile" => test_pem("embeddedSCTs1_issuer.pem"),
+            extra => {
+                "CTValidation" => "Permissive",
+            },
+        },
+        test => {
+            "HandshakeMode" => "Resume",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success",
+        },
+    },
     {
-	name => "ct-strict-resumption",
-	server => { },
-	client => {
-     	    extra => {
-	        "CTValidation" => "Permissive",
-	    },
-	},
-	# SCTs are not present during resumption, so the resumption
-	# should succeed.
-	resume_client => {
-     	    extra => {
-	        "CTValidation" => "Strict",
-	    },
-	},
-	test => {
-	    "HandshakeMode" => "Resume",
-	    "ResumptionExpected" => "Yes",
-	    "ExpectedResult" => "Success",
-	},
+        name => "ct-strict-resumption",
+        server => {
+            "Certificate" => test_pem("embeddedSCTs1.pem"),
+            "PrivateKey"  => test_pem("embeddedSCTs1-key.pem"),
+        },
+        client => {
+            "VerifyCAFile" => test_pem("embeddedSCTs1_issuer.pem"),
+            extra => {
+                "CTValidation" => "Strict",
+            },
+        },
+        # SCTs are not present during resumption, so the resumption
+        # should succeed.
+        resume_client => {
+            extra => {
+                "CTValidation" => "Strict",
+            },
+        },
+        test => {
+            "HandshakeMode" => "Resume",
+            "ResumptionExpected" => "Yes",
+            "ExpectedResult" => "Success",
+        },
     },
 );