mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
d542790b07
Make sure we get an HRR in the right circumstances based on kex mode. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2341)
181 lines
7.1 KiB
Perl
181 lines
7.1 KiB
Perl
#! /usr/bin/env perl
|
|
# Copyright 2015-2016 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
|
|
|
|
package checkhandshake;
|
|
|
|
use OpenSSL::Test qw/:DEFAULT cmdstr srctop_file srctop_dir bldtop_dir/;
|
|
use OpenSSL::Test::Utils;
|
|
use TLSProxy::Proxy;
|
|
|
|
use Exporter;
|
|
our @ISA = 'Exporter';
|
|
our @EXPORT = qw(@handmessages @extensions checkhandshake);
|
|
|
|
use constant {
|
|
DEFAULT_HANDSHAKE => 1,
|
|
OCSP_HANDSHAKE => 2,
|
|
RESUME_HANDSHAKE => 4,
|
|
CLIENT_AUTH_HANDSHAKE => 8,
|
|
RENEG_HANDSHAKE => 16,
|
|
NPN_HANDSHAKE => 32,
|
|
EC_HANDSHAKE => 64,
|
|
HRR_HANDSHAKE => 128,
|
|
HRR_RESUME_HANDSHAKE => 256,
|
|
|
|
ALL_HANDSHAKES => 511
|
|
};
|
|
|
|
use constant {
|
|
#DEFAULT ALSO INCLUDES SESSION_TICKET_SRV_EXTENSION
|
|
DEFAULT_EXTENSIONS => 0x00000003,
|
|
SESSION_TICKET_SRV_EXTENSION => 0x00000002,
|
|
SERVER_NAME_CLI_EXTENSION => 0x00000004,
|
|
SERVER_NAME_SRV_EXTENSION => 0x00000008,
|
|
STATUS_REQUEST_CLI_EXTENSION => 0x00000010,
|
|
STATUS_REQUEST_SRV_EXTENSION => 0x00000020,
|
|
ALPN_CLI_EXTENSION => 0x00000040,
|
|
ALPN_SRV_EXTENSION => 0x00000080,
|
|
SCT_CLI_EXTENSION => 0x00000100,
|
|
SCT_SRV_EXTENSION => 0x00000200,
|
|
RENEGOTIATE_CLI_EXTENSION => 0x00000400,
|
|
NPN_CLI_EXTENSION => 0x00000800,
|
|
NPN_SRV_EXTENSION => 0x00001000,
|
|
SRP_CLI_EXTENSION => 0x00002000,
|
|
#Client side for ec point formats is a default extension
|
|
EC_POINT_FORMAT_SRV_EXTENSION => 0x00004000,
|
|
PSK_CLI_EXTENSION => 0x00008000,
|
|
PSK_SRV_EXTENSION => 0x00010000,
|
|
KEY_SHARE_SRV_EXTENSION => 0x00020000,
|
|
PSK_KEX_MODES_EXTENSION => 0x00040000,
|
|
KEY_SHARE_HRR_EXTENSION => 0x00080000
|
|
};
|
|
|
|
our @handmessages = ();
|
|
our @extensions = ();
|
|
|
|
sub checkhandshake($$$$)
|
|
{
|
|
my ($proxy, $handtype, $exttype, $testname) = @_;
|
|
|
|
subtest $testname => sub {
|
|
my $loop = 0;
|
|
my $numtests;
|
|
my $extcount;
|
|
my $clienthelloseen = 0;
|
|
|
|
#First count the number of tests
|
|
my $nextmess = 0;
|
|
my $message = undef;
|
|
my $chnum = 0;
|
|
for ($numtests = 0; $handmessages[$loop][1] != 0; $loop++) {
|
|
next if (($handmessages[$loop][1] & $handtype) == 0);
|
|
if (scalar @{$proxy->message_list} > $nextmess) {
|
|
$message = ${$proxy->message_list}[$nextmess];
|
|
$nextmess++;
|
|
} else {
|
|
$message = undef;
|
|
}
|
|
$numtests++;
|
|
|
|
next if (!defined $message);
|
|
$chnum = 1 if $message->mt() != TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& TLSProxy::Proxy::is_tls13();
|
|
next if ($message->mt() != TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& $message->mt() != TLSProxy::Message::MT_HELLO_RETRY_REQUEST
|
|
&& $message->mt() != TLSProxy::Message::MT_SERVER_HELLO
|
|
&& $message->mt() !=
|
|
TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS
|
|
&& $message->mt() != TLSProxy::Message::MT_CERTIFICATE);
|
|
|
|
next if $message->mt() == TLSProxy::Message::MT_CERTIFICATE
|
|
&& !TLSProxy::Proxy::is_tls13();
|
|
|
|
my $extchnum = 0;
|
|
for (my $extloop = 0;
|
|
$extensions[$extloop][2] != 0;
|
|
$extloop++) {
|
|
$extchnum = 1 if $extensions[$extloop][0] != TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& TLSProxy::Proxy::is_tls13();
|
|
next if $extensions[$extloop][0] == TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& $extchnum != $chnum;
|
|
next if ($message->mt() != $extensions[$extloop][0]);
|
|
$numtests++;
|
|
}
|
|
$numtests++;
|
|
}
|
|
|
|
plan tests => $numtests;
|
|
|
|
$nextmess = 0;
|
|
$message = undef;
|
|
$chnum = 0;
|
|
for ($loop = 0; $handmessages[$loop][1] != 0; $loop++) {
|
|
next if (($handmessages[$loop][1] & $handtype) == 0);
|
|
if (scalar @{$proxy->message_list} > $nextmess) {
|
|
$message = ${$proxy->message_list}[$nextmess];
|
|
$nextmess++;
|
|
} else {
|
|
$message = undef;
|
|
}
|
|
if (!defined $message) {
|
|
fail("Message type check. Got nothing, expected "
|
|
.$handmessages[$loop][0]);
|
|
next;
|
|
} else {
|
|
ok($message->mt == $handmessages[$loop][0],
|
|
"Message type check. Got ".$message->mt
|
|
.", expected ".$handmessages[$loop][0]);
|
|
}
|
|
$chnum = 1 if $message->mt() != TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& TLSProxy::Proxy::is_tls13();
|
|
|
|
next if ($message->mt() != TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& $message->mt() != TLSProxy::Message::MT_HELLO_RETRY_REQUEST
|
|
&& $message->mt() != TLSProxy::Message::MT_SERVER_HELLO
|
|
&& $message->mt() !=
|
|
TLSProxy::Message::MT_ENCRYPTED_EXTENSIONS
|
|
&& $message->mt() != TLSProxy::Message::MT_CERTIFICATE);
|
|
|
|
next if $message->mt() == TLSProxy::Message::MT_CERTIFICATE
|
|
&& !TLSProxy::Proxy::is_tls13();
|
|
|
|
if ($message->mt() == TLSProxy::Message::MT_CLIENT_HELLO) {
|
|
#Add renegotiate extension we will expect if renegotiating
|
|
$exttype |= RENEGOTIATE_CLI_EXTENSION
|
|
if ($clienthelloseen && !TLSProxy::Proxy::is_tls13());
|
|
$clienthelloseen = 1;
|
|
}
|
|
#Now check that we saw the extensions we expected
|
|
my $msgexts = $message->extension_data();
|
|
my $extchnum = 0;
|
|
for (my $extloop = 0, $extcount = 0; $extensions[$extloop][2] != 0;
|
|
$extloop++) {
|
|
#In TLSv1.3 we can have two ClientHellos if there has been a
|
|
#HelloRetryRequest, and they may have different extensions. Skip
|
|
#if these are extensions for a different ClientHello
|
|
$extchnum = 1 if $extensions[$extloop][0] != TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& TLSProxy::Proxy::is_tls13();
|
|
next if $extensions[$extloop][0] == TLSProxy::Message::MT_CLIENT_HELLO
|
|
&& $extchnum != $chnum;
|
|
next if ($message->mt() != $extensions[$extloop][0]);
|
|
ok (($extensions[$extloop][2] & $exttype) == 0
|
|
|| defined ($msgexts->{$extensions[$extloop][1]}),
|
|
"Extension presence check (Message: ".$message->mt()
|
|
." Extension: ".($extensions[$extloop][2] & $exttype).", "
|
|
.$extloop.")");
|
|
$extcount++ if (($extensions[$extloop][2] & $exttype) != 0);
|
|
}
|
|
ok($extcount == keys %$msgexts, "Extensions count mismatch ("
|
|
.$extcount.", ".(keys %$msgexts)
|
|
.")");
|
|
}
|
|
}
|
|
}
|
|
|
|
1;
|