From: Matt Caswell <matt@openssl.org>
Date: Tue, 29 Nov 2016 14:56:06 +0000 (+0000)
Subject: Enable status_request test in test_sslmessages
X-Git-Tag: OpenSSL_1_1_1-pre1~2895
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2de94a3601863a74a52a07fa5743b0f85984e755;p=oweals%2Fopenssl.git

Enable status_request test in test_sslmessages

The s_server option -status_file has been added so this test can be
enabled.

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index cb5700a269..360824c720 100755
--- a/test/recipes/70-test_sslmessages.t
+++ b/test/recipes/70-test_sslmessages.t
@@ -88,16 +88,12 @@ checkmessages(RESUME_HANDSHAKE, "Resumption handshake test");
 unlink $session;
 
 #Test 3: A default handshake, but with a CertificateStatus message
-#
-#TODO: PR #1932 adds the "-status_file" option below. Once added we can enable
-#this test
-#
-#$proxy->clear();
-#$proxy->clientflags("-no_tls1_3 -status");
-#$proxy->serverflags("-no_ticket -status_file "
-#                    .srctop_file("test", "recipes", "ocsp-response.der"));
-#$proxy->start();
-#checkmessages(OCSP_HANDSHAKE, "OCSP handshake test");
+$proxy->clear();
+$proxy->clientflags("-no_tls1_3 -status");
+$proxy->serverflags("-status_file "
+                    .srctop_file("test", "recipes", "ocsp-response.der"));
+$proxy->start();
+checkmessages(OCSP_HANDSHAKE, "OCSP handshake test");
 
 #Test 4: A client auth handshake
 $proxy->clear();
@@ -113,15 +109,6 @@ $proxy->reneg(1);
 $proxy->start();
 checkmessages(RENEG_HANDSHAKE, "Rengotiation handshake test");
 
-#Test 6: A handshake with a renegotiation and client auth
-$proxy->clear();
-$proxy->clientflags("-no_tls1_3 -cert ".srctop_file("apps", "server.pem"));
-$proxy->serverflags("-Verify 5");
-$proxy->reneg(1);
-$proxy->start();
-checkmessages(RENEG_HANDSHAKE | CLIENT_AUTH_HANDSHAKE,
-              "Renogitation and client auth handshake test");
-
 sub checkmessages($$)
 {
     my ($handtype, $testname) = @_;