diff options
author | Matt Caswell <matt@openssl.org> | 2017-03-10 13:54:32 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-03-10 15:29:24 +0000 |
commit | 717afd9337abb2ec8f4b59c7c700fe417e746346 (patch) | |
tree | 0f52d006fa82d901d1a681b60c1c9781916f50f6 /test | |
parent | 652a6b7ee1be26c1a5205a494b0245d41dc34e26 (diff) |
Add a test to check that if a PSK extension is not last then we fail
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2896)
Diffstat (limited to 'test')
-rw-r--r-- | test/recipes/70-test_tls13psk.t | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/test/recipes/70-test_tls13psk.t b/test/recipes/70-test_tls13psk.t new file mode 100644 index 0000000000..2607d51f56 --- /dev/null +++ b/test/recipes/70-test_tls13psk.t @@ -0,0 +1,73 @@ +#! /usr/bin/env perl +# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved. +# +# Licensed under the OpenSSL license (the "License"). You may not use +# this file except in compliance with the License. You can obtain a copy +# in the file LICENSE in the source distribution or at +# https://www.openssl.org/source/license.html + +use strict; +use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/; +use OpenSSL::Test::Utils; +use File::Temp qw(tempfile); +use TLSProxy::Proxy; + +my $test_name = "test_tls13psk"; +setup($test_name); + +plan skip_all => "TLSProxy isn't usable on $^O" + if $^O =~ /^(VMS|MSWin32)$/; + +plan skip_all => "$test_name needs the dynamic engine feature enabled" + if disabled("engine") || disabled("dynamic-engine"); + +plan skip_all => "$test_name needs the sock feature enabled" + if disabled("sock"); + +plan skip_all => "$test_name needs TLSv1.3 enabled" + if disabled("tls1_3"); + +$ENV{OPENSSL_ia32cap} = '~0x200000200000000'; +$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf"); + +my $proxy = TLSProxy::Proxy->new( + undef, + cmdstr(app(["openssl"]), display => 1), + srctop_file("apps", "server.pem"), + (!$ENV{HARNESS_ACTIVE} || $ENV{HARNESS_VERBOSE}) +); + +#Most PSK tests are done in test_ssl_new. This just checks sending a PSK +#extension when it isn't in the last place in a ClientHello + +#Test 1: First get a session +(undef, my $session) = tempfile(); +$proxy->clientflags("-sess_out ".$session); +$proxy->sessionfile($session); +$proxy->start() or plan skip_all => "Unable to start up Proxy for tests"; +plan tests => 2; +ok(TLSProxy::Message->success(), "Initial connection"); + +#Test 2: Attempt a resume with PSK not in last place. Should fail +$proxy->clear(); +$proxy->clientflags("-sess_in ".$session); +$proxy->filter(\&modify_psk_filter); +$proxy->start(); +ok(TLSProxy::Message->fail(), "PSK not last"); + +unlink $session; + +sub modify_psk_filter +{ + my $proxy = shift; + + # We're only interested in the initial ClientHello + return if ($proxy->flight != 0); + + foreach my $message (@{$proxy->message_list}) { + if ($message->mt == TLSProxy::Message::MT_CLIENT_HELLO) { + $message->set_extension(TLSProxy::Message::EXT_FORCE_LAST, ""); + $message->repack(); + } + } +} |