Move the checkhandshake.pm module into test/testlib

Move this module into the same place as other test helper modules. It
simplifies the code and keeps like things together.

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>

3 files changed, 177 insertions, 191 deletions

diff --git a/test/recipes/70-test_sslmessages.t b/test/recipes/70-test_sslmessages.t
index dc2b3addc2..2476fb1184 100755
--- a/test/recipes/70-test_sslmessages.t
+++ b/test/recipes/70-test_sslmessages.t
@@ -11,17 +11,10 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;
 use OpenSSL::Test::Utils;
 use File::Temp qw(tempfile);
 use TLSProxy::Proxy;
+use checkhandshake qw(checkhandshake @handmessages @extensions);
 
-my $test_name;
-
-# This block needs to run before 'use lib srctop_dir' directives.
-BEGIN {
-    $test_name = "test_sslmessages";
-    OpenSSL::Test::setup($test_name);
-}
-use lib srctop_dir("test");
-
-use recipes::checkhandshake qw(checkhandshake @handmessages @extensions);
+my $test_name = "test_sslmessages";
+setup($test_name);
 
 plan skip_all => "TLSProxy isn't usable on $^O"
     if $^O =~ /^(VMS|MSWin32)$/;
@@ -47,101 +40,101 @@ my $proxy = TLSProxy::Proxy->new(
 
 @handmessages = (
     [TLSProxy::Message::MT_CLIENT_HELLO,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_SERVER_HELLO,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE_STATUS,
-        recipes::checkhandshake::OCSP_HANDSHAKE],
+        checkhandshake::OCSP_HANDSHAKE],
     #ServerKeyExchange handshakes not currently supported by TLSProxy
     [TLSProxy::Message::MT_CERTIFICATE_REQUEST,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_SERVER_HELLO_DONE,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE_VERIFY,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_NEXT_PROTO,
-        recipes::checkhandshake::NPN_HANDSHAKE],
+        checkhandshake::NPN_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_NEW_SESSION_TICKET,
-        recipes::checkhandshake::ALL_HANDSHAKES
-        & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES
+        & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_CLIENT_HELLO,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_SERVER_HELLO,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_SERVER_HELLO_DONE,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_CLIENT_KEY_EXCHANGE,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_NEW_SESSION_TICKET,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::RENEG_HANDSHAKE],
+        checkhandshake::RENEG_HANDSHAKE],
     [0, 0]
 );
 
 @extensions = (
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SERVER_NAME,
-        recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION],
+        checkhandshake::SERVER_NAME_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,
-        recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION],
+        checkhandshake::STATUS_REQUEST_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SUPPORTED_GROUPS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EC_POINT_FORMATS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SIG_ALGS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ALPN,
-        recipes::checkhandshake::ALPN_CLI_EXTENSION],
+        checkhandshake::ALPN_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SCT,
-        recipes::checkhandshake::SCT_CLI_EXTENSION],
+        checkhandshake::SCT_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_RENEGOTIATE,
-        recipes::checkhandshake::RENEGOTIATE_CLI_EXTENSION],
+        checkhandshake::RENEGOTIATE_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_NPN,
-        recipes::checkhandshake::NPN_CLI_EXTENSION],
+        checkhandshake::NPN_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SRP,
-        recipes::checkhandshake::SRP_CLI_EXTENSION],
+        checkhandshake::SRP_CLI_EXTENSION],
 
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_RENEGOTIATE,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,
-        recipes::checkhandshake::SESSION_TICKET_SRV_EXTENSION],
+        checkhandshake::SESSION_TICKET_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SERVER_NAME,
-        recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION],
+        checkhandshake::SERVER_NAME_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,
-        recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
+        checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_ALPN,
-        recipes::checkhandshake::ALPN_SRV_EXTENSION],
+        checkhandshake::ALPN_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_SCT,
-        recipes::checkhandshake::SCT_SRV_EXTENSION],
+        checkhandshake::SCT_SRV_EXTENSION],
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_NPN,
-        recipes::checkhandshake::NPN_SRV_EXTENSION],
+        checkhandshake::NPN_SRV_EXTENSION],
     [0,0,0]
 );
 
@@ -151,17 +144,17 @@ $proxy->serverconnects(2);
 $proxy->clientflags("-no_tls1_3 -sess_out ".$session);
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
 plan tests => 20;
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
                "Default handshake test");
 
 #Test 2: Resumption handshake
 $proxy->clearClient();
 $proxy->clientflags("-no_tls1_3 -sess_in ".$session);
 $proxy->clientstart();
-checkhandshake($proxy, recipes::checkhandshake::RESUME_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               & ~recipes::checkhandshake::SESSION_TICKET_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               & ~checkhandshake::SESSION_TICKET_SRV_EXTENSION,
                "Resumption handshake test");
 unlink $session;
 
@@ -169,9 +162,9 @@ unlink $session;
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -status");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
               "status_request handshake test (client)");
 
 #Test 4: A status_request handshake (server support only)
@@ -180,8 +173,8 @@ $proxy->clientflags("-no_tls1_3");
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "status_request handshake test (server)");
 
 #Test 5: A status_request handshake (client and server)
@@ -190,10 +183,10 @@ $proxy->clientflags("-no_tls1_3 -status");
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
               "status_request handshake test");
 
 #Test 6: A client auth handshake
@@ -201,8 +194,8 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -cert ".srctop_file("apps", "server.pem"));
 $proxy->serverflags("-Verify 5");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::CLIENT_AUTH_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
                "Client auth handshake test");
 
 #Test 7: A handshake with a renegotiation
@@ -210,17 +203,17 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3");
 $proxy->reneg(1);
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::RENEG_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::RENEG_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
                "Rengotiation handshake test");
 
 #Test 8: Server name handshake (client request only)
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SERVER_NAME_CLI_EXTENSION,
               "Server name handshake test (client)");
 
 #Test 9: Server name handshake (server support only)
@@ -228,8 +221,8 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "Server name handshake test (server)");
 
 #Test 10: Server name handshake (client and server)
@@ -237,19 +230,19 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -servername testhost");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION
-              | recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::SERVER_NAME_CLI_EXTENSION
+              | checkhandshake::SERVER_NAME_SRV_EXTENSION,
               "Server name handshake test");
 
 #Test 11: ALPN handshake (client request only)
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::ALPN_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::ALPN_CLI_EXTENSION,
               "ALPN handshake test (client)");
 
 #Test 12: ALPN handshake (server support only)
@@ -257,8 +250,8 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3");
 $proxy->serverflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "ALPN handshake test (server)");
 
 #Test 13: ALPN handshake (client and server)
@@ -266,10 +259,10 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -alpn test");
 $proxy->serverflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::ALPN_CLI_EXTENSION
-              | recipes::checkhandshake::ALPN_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::ALPN_CLI_EXTENSION
+              | checkhandshake::ALPN_SRV_EXTENSION,
               "ALPN handshake test");
 
 #Test 14: SCT handshake (client request only)
@@ -279,11 +272,11 @@ $proxy->clientflags("-no_tls1_3 -ct");
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SCT_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::SCT_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
               "SCT handshake test (client)");
 
 #Test 15: SCT handshake (server support only)
@@ -293,8 +286,8 @@ $proxy->clientflags("-no_tls1_3");
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS,
               "SCT handshake test (server)");
 
 #Test 16: SCT handshake (client and server)
@@ -307,12 +300,12 @@ $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der")
                     ." -serverinfo ".srctop_file("test", "serverinfo.pem"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SCT_CLI_EXTENSION
-              | recipes::checkhandshake::SCT_SRV_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::SCT_CLI_EXTENSION
+              | checkhandshake::SCT_SRV_EXTENSION
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
               "SCT handshake test");
 
 
@@ -320,9 +313,9 @@ checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -nextprotoneg test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::NPN_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::NPN_CLI_EXTENSION,
               "NPN handshake test (client)");
 
 #Test 18: NPN handshake (server support only)
@@ -330,8 +323,8 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3");
 $proxy->serverflags("-nextprotoneg test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "NPN handshake test (server)");
 
 #Test 19: NPN handshake (client and server)
@@ -339,10 +332,10 @@ $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -nextprotoneg test");
 $proxy->serverflags("-nextprotoneg test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::NPN_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::NPN_CLI_EXTENSION
-              | recipes::checkhandshake::NPN_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::NPN_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::NPN_CLI_EXTENSION
+              | checkhandshake::NPN_SRV_EXTENSION,
               "NPN handshake test");
 
 #Test 20: SRP extension
@@ -353,7 +346,7 @@ checkhandshake($proxy, recipes::checkhandshake::NPN_HANDSHAKE,
 $proxy->clear();
 $proxy->clientflags("-no_tls1_3 -srpuser user -srppass pass:pass");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SRP_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::SRP_CLI_EXTENSION,
               "SRP extension test");
diff --git a/test/recipes/70-test_tls13messages.t b/test/recipes/70-test_tls13messages.t
index d0530ff8ad..f1493613b7 100755
--- a/test/recipes/70-test_tls13messages.t
+++ b/test/recipes/70-test_tls13messages.t
@@ -11,17 +11,10 @@ use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;
 use OpenSSL::Test::Utils;
 use File::Temp qw(tempfile);
 use TLSProxy::Proxy;
+use checkhandshake qw(checkhandshake @handmessages @extensions);
 
-my $test_name;
-
-# This block needs to run before 'use lib srctop_dir' directives.
-BEGIN {
-    $test_name = "test_tls13messages";
-    OpenSSL::Test::setup($test_name);
-}
-use lib srctop_dir("test");
-
-use recipes::checkhandshake qw(checkhandshake @handmessages @extensions);
+my $test_name = "test_tls13messages";
+setup($test_name);
 
 plan skip_all => "TLSProxy isn't usable on $^O"
     if $^O =~ /^(VMS|MSWin32)$/;
@@ -41,63 +34,63 @@ $ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
 
 @handmessages = (
     [TLSProxy::Message::MT_CLIENT_HELLO,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_SERVER_HELLO,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_CERTIFICATE_REQUEST,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::ALL_HANDSHAKES & ~recipes::checkhandshake::RESUME_HANDSHAKE],
+        checkhandshake::ALL_HANDSHAKES & ~checkhandshake::RESUME_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE_STATUS,
-        recipes::checkhandshake::OCSP_HANDSHAKE],
+        checkhandshake::OCSP_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [TLSProxy::Message::MT_CERTIFICATE,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_CERTIFICATE_VERIFY,
-        recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE],
+        checkhandshake::CLIENT_AUTH_HANDSHAKE],
     [TLSProxy::Message::MT_FINISHED,
-        recipes::checkhandshake::ALL_HANDSHAKES],
+        checkhandshake::ALL_HANDSHAKES],
     [0, 0]
 );
 
 @extensions = (
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SERVER_NAME,
-        recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION],
+        checkhandshake::SERVER_NAME_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_STATUS_REQUEST,
-        recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION],
+        checkhandshake::STATUS_REQUEST_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SUPPORTED_GROUPS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EC_POINT_FORMATS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SIG_ALGS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ALPN,
-        recipes::checkhandshake::ALPN_CLI_EXTENSION],
+        checkhandshake::ALPN_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SCT,
-        recipes::checkhandshake::SCT_CLI_EXTENSION],
+        checkhandshake::SCT_CLI_EXTENSION],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_ENCRYPT_THEN_MAC,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_EXTENDED_MASTER_SECRET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SESSION_TICKET,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_KEY_SHARE,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
     [TLSProxy::Message::MT_CLIENT_HELLO, TLSProxy::Message::EXT_SUPPORTED_VERSIONS,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
 
     [TLSProxy::Message::MT_SERVER_HELLO, TLSProxy::Message::EXT_KEY_SHARE,
-        recipes::checkhandshake::DEFAULT_EXTENSIONS],
+        checkhandshake::DEFAULT_EXTENSIONS],
 
     [TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS, TLSProxy::Message::EXT_SERVER_NAME,
-        recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION],
+        checkhandshake::SERVER_NAME_SRV_EXTENSION],
     [TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS, TLSProxy::Message::EXT_STATUS_REQUEST,
-        recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
+        checkhandshake::STATUS_REQUEST_SRV_EXTENSION],
     [TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS, TLSProxy::Message::EXT_ALPN,
-        recipes::checkhandshake::ALPN_SRV_EXTENSION],
+        checkhandshake::ALPN_SRV_EXTENSION],
     [0,0,0]
 );
 
@@ -114,8 +107,8 @@ my $proxy = TLSProxy::Proxy->new(
 $proxy->clientflags("-sess_out ".$session);
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
 plan tests => 12;
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
                "Default handshake test");
 
 #TODO(TLS1.3): Test temporarily disabled until we implement TLS1.3 resumption
@@ -130,9 +123,9 @@ unlink $session;
 $proxy->clear();
 $proxy->clientflags("-status");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION,
               "status_request handshake test (client)");
 
 #Test 4: A status_request handshake (server support only)
@@ -140,8 +133,8 @@ $proxy->clear();
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "status_request handshake test (server)");
 
 #Test 5: A status_request handshake (client and server)
@@ -153,10 +146,10 @@ $proxy->clientflags("-status");
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
               "status_request handshake test");
 
 #Test 6: A client auth handshake
@@ -164,25 +157,25 @@ $proxy->clear();
 $proxy->clientflags("-cert ".srctop_file("apps", "server.pem"));
 $proxy->serverflags("-Verify 5");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::CLIENT_AUTH_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::CLIENT_AUTH_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "Client auth handshake test");
 
 #Test 7: Server name handshake (client request only)
 $proxy->clear();
 $proxy->clientflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::SERVER_NAME_CLI_EXTENSION,
               "Server name handshake test (client)");
 
 #Test 8: Server name handshake (server support only)
 $proxy->clear();
 $proxy->serverflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "Server name handshake test (server)");
 
 #Test 9: Server name handshake (client and server)
@@ -190,27 +183,27 @@ $proxy->clear();
 $proxy->clientflags("-servername testhost");
 $proxy->serverflags("-servername testhost");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SERVER_NAME_CLI_EXTENSION
-              | recipes::checkhandshake::SERVER_NAME_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::SERVER_NAME_CLI_EXTENSION
+              | checkhandshake::SERVER_NAME_SRV_EXTENSION,
               "Server name handshake test");
 
 #Test 10: ALPN handshake (client request only)
 $proxy->clear();
 $proxy->clientflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS
-               | recipes::checkhandshake::ALPN_CLI_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS
+               | checkhandshake::ALPN_CLI_EXTENSION,
               "ALPN handshake test (client)");
 
 #Test 11: ALPN handshake (server support only)
 $proxy->clear();
 $proxy->serverflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-               recipes::checkhandshake::DEFAULT_EXTENSIONS,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+               checkhandshake::DEFAULT_EXTENSIONS,
               "ALPN handshake test (server)");
 
 #Test 12: ALPN handshake (client and server)
@@ -218,10 +211,10 @@ $proxy->clear();
 $proxy->clientflags("-alpn test");
 $proxy->serverflags("-alpn test");
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::DEFAULT_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::ALPN_CLI_EXTENSION
-              | recipes::checkhandshake::ALPN_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::DEFAULT_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::ALPN_CLI_EXTENSION
+              | checkhandshake::ALPN_SRV_EXTENSION,
               "ALPN handshake test");
 
 #Test 13: SCT handshake (client request only)
@@ -237,9 +230,9 @@ $proxy->clientflags("-ct");
 $proxy->serverflags("-status_file "
                     .srctop_file("test", "recipes", "ocsp-response.der"));
 $proxy->start();
-checkhandshake($proxy, recipes::checkhandshake::OCSP_HANDSHAKE,
-              recipes::checkhandshake::DEFAULT_EXTENSIONS
-              | recipes::checkhandshake::SCT_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_CLI_EXTENSION
-              | recipes::checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
+checkhandshake($proxy, checkhandshake::OCSP_HANDSHAKE,
+              checkhandshake::DEFAULT_EXTENSIONS
+              | checkhandshake::SCT_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_CLI_EXTENSION
+              | checkhandshake::STATUS_REQUEST_SRV_EXTENSION,
               "SCT handshake test");
diff --git a/test/recipes/checkhandshake.pm b/test/testlib/checkhandshake.pm
index abd1ffd119..eb34fff622 100644
--- a/test/recipes/checkhandshake.pm
+++ b/test/testlib/checkhandshake.pm
@@ -6,7 +6,7 @@
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
 
-package recipes::checkhandshake;
+package checkhandshake;
 
 use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;
 use OpenSSL::Test::Utils;