From cc24a22b83d8cc210b9c279f185b79f0875817c1 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Tue, 15 Nov 2016 14:53:37 +0000
Subject: [PATCH] Extend test_tls13messages

Add various different handshake types that are possible.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 test/recipes/70-test_tls13messages.t |  51 +++++++++++++++++++++++----
 test/recipes/ocsp-response.der       | Bin 0 -> 1517 bytes
 2 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 test/recipes/ocsp-response.der

diff --git a/test/recipes/70-test_tls13messages.t b/test/recipes/70-test_tls13messages.t
index 9c1b6ee5f8..62c12c4ad3 100755
--- a/test/recipes/70-test_tls13messages.t
+++ b/test/recipes/70-test_tls13messages.t
@@ -9,6 +9,7 @@
 use strict;
 use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file bldtop_dir/;
 use OpenSSL::Test::Utils;
+use File::Temp qw(tempfile);
 use TLSProxy::Proxy;
 my $test_name = "test_tls13messages";
 setup($test_name);
@@ -28,15 +29,23 @@ plan skip_all => "$test_name needs TLSv1.3 enabled"
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
 
 use constant {
-    DEFAULT_HANDSHAKE => 1
+    DEFAULT_HANDSHAKE => 1,
+    OCSP_HANDSHAKE => 2,
+    RESUME_HANDSHAKE => 4,
+    CLIENT_AUTH_HANDSHAKE => 8,
+    ALL_HANDSHAKES => 15
 };
 
 my @handmessages = (
-    [TLSProxy::Message::MT_CLIENT_HELLO, DEFAULT_HANDSHAKE],
-    [TLSProxy::Message::MT_SERVER_HELLO, DEFAULT_HANDSHAKE],
-    [TLSProxy::Message::MT_CERTIFICATE, DEFAULT_HANDSHAKE],
-    [TLSProxy::Message::MT_FINISHED, DEFAULT_HANDSHAKE],
-    [TLSProxy::Message::MT_FINISHED, DEFAULT_HANDSHAKE],
+    [TLSProxy::Message::MT_CLIENT_HELLO, ALL_HANDSHAKES],
+    [TLSProxy::Message::MT_SERVER_HELLO, ALL_HANDSHAKES],
+    [TLSProxy::Message::MT_CERTIFICATE_REQUEST, CLIENT_AUTH_HANDSHAKE],
+    [TLSProxy::Message::MT_CERTIFICATE, ALL_HANDSHAKES & ~RESUME_HANDSHAKE],
+    [TLSProxy::Message::MT_CERTIFICATE_STATUS, OCSP_HANDSHAKE],
+    [TLSProxy::Message::MT_FINISHED, ALL_HANDSHAKES],
+    [TLSProxy::Message::MT_CERTIFICATE, CLIENT_AUTH_HANDSHAKE],
+    [TLSProxy::Message::MT_CERTIFICATE_VERIFY, CLIENT_AUTH_HANDSHAKE],
+    [TLSProxy::Message::MT_FINISHED, ALL_HANDSHAKES],
     [0, 0]
 );
 
@@ -50,10 +59,38 @@ my $proxy = TLSProxy::Proxy->new(
 sub checkmessages($$);
 
 #Test 1: Check we get all the right messages for a default handshake
+(undef, my $session) = tempfile();
+$proxy->serverconnects(2);
+$proxy->clientflags("-sess_out ".$session);
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 1;
+plan tests => 4;
 checkmessages(DEFAULT_HANDSHAKE, "Default handshake test");
 
+#Test 2: Resumption handshake
+$proxy->clearClient();
+$proxy->clientflags("-sess_in ".$session);
+$proxy->clientstart();
+checkmessages(RESUME_HANDSHAKE, "Resumption handshake test");
+unlink $session;
+
+#Test 3: A default handshake, but with a CertificateStatus message
+#TODO(TLS1.3): TLS1.3 doesn't actually have CertificateStatus messages. This is
+#a temporary test until such time as we do proper TLS1.3 style certificate
+#status
+$proxy->clear();
+$proxy->clientflags("-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();
+$proxy->clientflags("-cert ".srctop_file("apps", "server.pem"));
+$proxy->serverflags("-Verify 5");
+$proxy->start();
+checkmessages(CLIENT_AUTH_HANDSHAKE, "Client auth handshake test");
+
 sub checkmessages($$)
 {
     my ($handtype, $testname) = @_;
diff --git a/test/recipes/ocsp-response.der b/test/recipes/ocsp-response.der
new file mode 100644
index 0000000000000000000000000000000000000000..31351a0e3c89c0611fcf1b81a3c0e7ba4e58986f
GIT binary patch
literal 1517
zcmXqLVtvWQ$grS^^^rjn>peD3Z8k<$R(1nMMwTYl^FX1~22G4o3me-E8k-Hd4LI4D
zLs{5_ncSTW<qc#(91b3_kksN5h2WCJl2nEKB87mW{Iblv<Wxf`0|}4<E*?SuqV&YP
z%&Nqa%=|nBzr@^BLq!95kQ_IU1hQOWjzVZ&W(h=zh=CAD2{RA3bAE0vRHFpHk%6I^
zp`oFvp^2f1fpL^Uq(QiW6VP3(+I-ARQmhOtBC=)o+Fs{wtXPq8&{!n!<5y?B=>{w!
zC%WcMOW&9|<HHSx`PoVxT(X>fCz&`IzB6ntoL)Z3vw;D_=!MD#AZNlugo#CnML_s@
zMPs!7RD+mj8SC?u9z8bTW#iOp^Jx3d%gD&h%D~*j$jD&$*L=nGC7w$^>vu{$UufR-
zs_sZ&Xg1rTGsh1sw_;a$t5x*1pm*~umh#Wq{~VS`eF#uczQ3pP;h!m+9p#>7U+A;m
zye+-uxth1*(v1f+3Qm1fJGkxnnN*%NYZR|IIqWeL_mETEFwZSs<a|xgj~n+{{z{uM
zUDGHq`ss4XAfd;(u=m`WN#9q>o)I$oCUfuqFB@mQ%%x0L8O9xYe+u{tJ~{T?GmO>U
zptUTyCiQ1~iN}>?ZW}BZc=xG%ONx6qufg-0SKI5%S7vOjpRU{#d)BJ><=nAX#;GqC
z`k1n~>6s;k2ww1WPWY9mIyWn;$aEW*s)6{s(^<2YWUg4eV?)D3mao>67Bn$WHE3d<
z2*kYxO-!W=n3))v5Mk|(9A+%63<lvy3Cl6mP}o2alCZdf^K(;m!3hhNV7PcBJo8FY
zi}F%S6v8u8(lbkn6#_~s6?{rk3<V7MAPI&&C_leM!P(J3PMp`!)WE{P)X>t@$k03r
z$Tb6UO`zPtk)(n7O9?qd7{RHCp8+V&#RN)DduJTD{lM`QUsH(9#2Z?LSL%K<2=9JA
z(a3zpX_e{~t=DB&9+bUt_0FR%^VJEAz1Aztu9O{1oKVKlzOUVIyJi(z15@_1^QPg-
z#cQJ;|Nbeaa&}ex+lx{Y*pl;38#MFXjwmwoP&oR1$FuU#{hFs9<!CKxQCjZN8)nHn
zJ>$tyg>5DZw=`zITlgu}(_PHd(?dx|xuZEFZS$->E6b)&IP4R2xx;HxX1x>lme-tj
zcWT|4r>7GA=;_t9Keis&GwWaJ%^%^(Zl-b@j-6lem3dC(o4p@jh0JIAx6o)^`^mH|
z`?ps{)$q*}5<Gq3<BtF4GZ>3se`v~!k#lLiF0Fpn{Mf-oOEu;*F*7nSF4i~D1(!au
z!YoV%3<li5sFvktVPR%sePAFA;;6Fl7;v$1K*}#>PUIj3CNglw4418%bLDb>{Qn2*
z=L@dZ^Dp=-A+YGZDAT&SSFP_1V}+OATG^>(z-?K$ZAXl!p^#Cqxd_AjthH0)AJ3iZ
zBC$m%$t&Yf>fQxWE`t5*{ia1cWh$RK?L~~>E$(xSLfW4exOX0ki$DJ<Ysu4DX9U9U
z@A;Fz;T^}MUF~egZ72NtIU^-mHqBXHWYXoXmlFkQD`sBUIb&+u8aeJ;*?Af>j7`!i
z`>W<JS=zhjtzk#zz1*+f-_swKmb`J*G|$og{_sHfxfu*Kv+{Bs8z-#2^ZvT=9lzh|
zo9^yRWUrM-I2)lZ)9ewNBdM6FxWaU?{IykO_Qp5o_f+YbomhS6VZ@c|@A7!#Z;Ai_
Ds-`tR

literal 0
HcmV?d00001