UNRECOGNISED_VERSIONS => 2,
NO_EXTENSION => 3,
EMPTY_EXTENSION => 4,
- NO_TLS1_3 => 5
+ TLS1_1_AND_1_0_ONLY => 5,
+ WITH_TLS1_4 => 6
};
my $testtype;
$testtype = EMPTY_EXTENSION;
$proxy->filter(\&modify_supported_versions_filter);
$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 6;
+plan tests => 7;
ok(TLSProxy::Message->fail(), "Empty supported versions");
#Test 2: supported_versions extension with no recognised versions should not
$proxy->start();
$record = pop @{$proxy->record_list};
ok(TLSProxy::Message->success()
- && $record->version() == TLSProxy::Record::VERS_TLS_1_3,
+ && $record->version() == TLSProxy::Record::VERS_TLS_1_2
+ && TLSProxy::Proxy->is_tls13(),
"Reverse order versions");
#Test 6: no TLSv1.3 or TLSv1.2 version in supported versions extension, but
#TLSv1.1 and TLSv1.0 are present. Should just use TLSv1.1 and succeed
$proxy->clear();
-$testtype = NO_TLS1_3;
+$testtype = TLS1_1_AND_1_0_ONLY;
$proxy->start();
$record = pop @{$proxy->record_list};
ok(TLSProxy::Message->success()
&& $record->version() == TLSProxy::Record::VERS_TLS_1_1,
- "No TLS1.3 in supported versions extension");
+ "TLS1.1 and TLS1.0 in supported versions extension only");
+
+#Test 7: TLS1.4 and TLS1.3 in supported versions. Should succeed and use TLS1.3
+$proxy->clear();
+$testtype = WITH_TLS1_4;
+$proxy->start();
+$record = pop @{$proxy->record_list};
+ok(TLSProxy::Message->success()
+ && $record->version() == TLSProxy::Record::VERS_TLS_1_2
+ && TLSProxy::Proxy->is_tls13(),
+ "TLS1.4 in supported versions extension");
sub modify_supported_versions_filter
{
my $proxy = shift;
+ if ($proxy->flight == 1) {
+ # Change the ServerRandom so that the downgrade sentinel doesn't cause
+ # the connection to fail
+ my $message = ${$proxy->message_list}[1];
+ return if (!defined $message);
+
+ $message->random("\0"x32);
+ $message->repack();
+ return;
+ }
+
# We're only interested in the initial ClientHello
if ($proxy->flight != 0) {
return;
0x04, # Length
0x04, 0x04, #Some unrecognised version
0x04, 0x03; #Another unrecognised version
- } elsif ($testtype == NO_TLS1_3) {
+ } elsif ($testtype == TLS1_1_AND_1_0_ONLY) {
$ext = pack "C5",
0x04, # Length
0x03, 0x02, #TLSv1.1
0x03, 0x01; #TLSv1.0
+ } elsif ($testtype == WITH_TLS1_4) {
+ $ext = pack "C5",
+ 0x04, # Length
+ 0x03, 0x05, #TLSv1.4
+ 0x03, 0x04; #TLSv1.3
}
if ($testtype == REVERSE_ORDER_VERSIONS
|| $testtype == UNRECOGNISED_VERSIONS
- || $testtype == NO_TLS1_3) {
+ || $testtype == TLS1_1_AND_1_0_ONLY
+ || $testtype == WITH_TLS1_4) {
$message->set_extension(
TLSProxy::Message::EXT_SUPPORTED_VERSIONS, $ext);
} elsif ($testtype == EMPTY_EXTENSION) {