2016-04-22 11:21:51 +00:00
|
|
|
#! /usr/bin/env perl
|
2018-02-13 12:51:29 +00:00
|
|
|
# Copyright 2015-2018 The OpenSSL Project Authors. All Rights Reserved.
|
2016-04-22 11:21:51 +00:00
|
|
|
#
|
|
|
|
# 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
|
|
|
|
|
2016-03-17 14:14:30 +00:00
|
|
|
|
|
|
|
use strict;
|
|
|
|
use warnings;
|
|
|
|
|
|
|
|
use File::Basename;
|
|
|
|
use File::Compare qw/compare_text/;
|
2017-08-01 20:43:56 +00:00
|
|
|
use OpenSSL::Glob;
|
2016-03-17 14:14:30 +00:00
|
|
|
use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file/;
|
|
|
|
use OpenSSL::Test::Utils qw/disabled alldisabled available_protocols/;
|
|
|
|
|
|
|
|
setup("test_ssl_new");
|
|
|
|
|
|
|
|
$ENV{TEST_CERTS_DIR} = srctop_dir("test", "certs");
|
2016-08-09 14:47:26 +00:00
|
|
|
$ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf");
|
2016-03-17 14:14:30 +00:00
|
|
|
|
2016-05-28 14:11:01 +00:00
|
|
|
my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.conf.in"));
|
2016-05-13 09:21:06 +00:00
|
|
|
map { s/;.*// } @conf_srcs if $^O eq "VMS";
|
2017-02-18 21:41:27 +00:00
|
|
|
my @conf_files = map { basename($_, ".in") } @conf_srcs;
|
|
|
|
map { s/\^// } @conf_files if $^O eq "VMS";
|
2016-03-17 14:14:30 +00:00
|
|
|
|
2016-08-02 09:19:07 +00:00
|
|
|
# We hard-code the number of tests to double-check that the globbing above
|
|
|
|
# finds all files as expected.
|
2018-10-12 15:24:14 +00:00
|
|
|
plan tests => 28; # = scalar @conf_srcs
|
2016-08-02 09:19:07 +00:00
|
|
|
|
2016-07-22 15:19:23 +00:00
|
|
|
# Some test results depend on the configuration of enabled protocols. We only
|
|
|
|
# verify generated sources in the default configuration.
|
2016-06-03 15:49:04 +00:00
|
|
|
my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&
|
2016-10-30 08:38:52 +00:00
|
|
|
!disabled("tls1_1") && !disabled("tls1_2") &&
|
2018-02-06 17:27:25 +00:00
|
|
|
!disabled("tls1_3"));
|
2016-03-17 14:14:30 +00:00
|
|
|
|
2016-06-03 15:49:04 +00:00
|
|
|
my $is_default_dtls = (!disabled("dtls1") && !disabled("dtls1_2"));
|
|
|
|
|
2016-11-29 09:49:04 +00:00
|
|
|
my @all_pre_tls1_3 = ("ssl3", "tls1", "tls1_1", "tls1_2");
|
2016-06-03 15:49:04 +00:00
|
|
|
my $no_tls = alldisabled(available_protocols("tls"));
|
2018-02-09 10:19:14 +00:00
|
|
|
my $no_tls_below1_3 = $no_tls || (disabled("tls1_2") && !disabled("tls1_3"));
|
2016-11-29 09:49:04 +00:00
|
|
|
my $no_pre_tls1_3 = alldisabled(@all_pre_tls1_3);
|
2016-06-03 15:49:04 +00:00
|
|
|
my $no_dtls = alldisabled(available_protocols("dtls"));
|
2016-07-04 18:16:14 +00:00
|
|
|
my $no_npn = disabled("nextprotoneg");
|
2016-08-09 14:47:26 +00:00
|
|
|
my $no_ct = disabled("ct");
|
2016-08-10 16:36:47 +00:00
|
|
|
my $no_ec = disabled("ec");
|
2017-02-19 05:59:33 +00:00
|
|
|
my $no_dh = disabled("dh");
|
|
|
|
my $no_dsa = disabled("dsa");
|
2016-08-24 12:54:05 +00:00
|
|
|
my $no_ec2m = disabled("ec2m");
|
2016-09-19 13:08:58 +00:00
|
|
|
my $no_ocsp = disabled("ocsp");
|
2016-06-03 15:49:04 +00:00
|
|
|
|
2016-08-19 12:19:32 +00:00
|
|
|
# Add your test here if the test conf.in generates test cases and/or
|
|
|
|
# expectations dynamically based on the OpenSSL compile-time config.
|
2016-06-03 15:49:04 +00:00
|
|
|
my %conf_dependent_tests = (
|
|
|
|
"02-protocol-version.conf" => !$is_default_tls,
|
2017-04-24 10:19:05 +00:00
|
|
|
"04-client_auth.conf" => !$is_default_tls || !$is_default_dtls
|
|
|
|
|| !disabled("sctp"),
|
2017-03-06 10:03:53 +00:00
|
|
|
"05-sni.conf" => disabled("tls1_1"),
|
2017-04-24 09:16:21 +00:00
|
|
|
"07-dtls-protocol-version.conf" => !$is_default_dtls || !disabled("sctp"),
|
2016-07-05 17:06:23 +00:00
|
|
|
"10-resumption.conf" => !$is_default_tls,
|
2017-04-24 10:03:11 +00:00
|
|
|
"11-dtls_resumption.conf" => !$is_default_dtls || !disabled("sctp"),
|
2017-04-24 08:42:28 +00:00
|
|
|
"16-dtls-certstatus.conf" => !$is_default_dtls || !disabled("sctp"),
|
2017-02-28 15:53:55 +00:00
|
|
|
"17-renegotiate.conf" => disabled("tls1_2"),
|
2017-04-24 08:42:28 +00:00
|
|
|
"18-dtls-renegotiate.conf" => disabled("dtls1_2") || !disabled("sctp"),
|
2016-12-25 16:57:32 +00:00
|
|
|
"19-mac-then-encrypt.conf" => !$is_default_tls,
|
2017-02-22 00:49:50 +00:00
|
|
|
"20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa,
|
2017-03-01 12:11:51 +00:00
|
|
|
"22-compression.conf" => !$is_default_tls,
|
2017-12-10 11:41:30 +00:00
|
|
|
"25-cipher.conf" => disabled("poly1305") || disabled("chacha"),
|
2018-03-14 14:04:18 +00:00
|
|
|
"27-ticket-appdata.conf" => !$is_default_tls,
|
2018-11-12 14:23:07 +00:00
|
|
|
"28-seclevel.conf" => disabled("tls1_2") || $no_ec,
|
2016-06-03 15:49:04 +00:00
|
|
|
);
|
|
|
|
|
2016-08-19 12:19:32 +00:00
|
|
|
# Add your test here if it should be skipped for some compile-time
|
|
|
|
# configurations. Default is $no_tls but some tests have different skip
|
|
|
|
# conditions.
|
2016-06-03 15:49:04 +00:00
|
|
|
my %skip = (
|
2018-02-09 10:19:14 +00:00
|
|
|
"06-sni-ticket.conf" => $no_tls_below1_3,
|
2016-07-22 15:19:23 +00:00
|
|
|
"07-dtls-protocol-version.conf" => $no_dtls,
|
2016-11-02 15:03:56 +00:00
|
|
|
"08-npn.conf" => (disabled("tls1") && disabled("tls1_1")
|
|
|
|
&& disabled("tls1_2")) || $no_npn,
|
2016-07-22 15:36:26 +00:00
|
|
|
"10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
|
|
|
|
"11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
|
2016-08-10 16:36:47 +00:00
|
|
|
"12-ct.conf" => $no_tls || $no_ct || $no_ec,
|
2016-08-16 13:11:08 +00:00
|
|
|
# We could run some of these tests without TLS 1.2 if we had a per-test
|
|
|
|
# disable instruction but that's a bizarre configuration not worth
|
|
|
|
# special-casing for.
|
2017-11-05 16:46:48 +00:00
|
|
|
# TODO(TLS 1.3): We should review this once we have TLS 1.3.
|
2016-08-20 17:51:14 +00:00
|
|
|
"13-fragmentation.conf" => disabled("tls1_2"),
|
2016-08-30 13:20:18 +00:00
|
|
|
"14-curves.conf" => disabled("tls1_2") || $no_ec || $no_ec2m,
|
2016-11-10 11:27:07 +00:00
|
|
|
"15-certstatus.conf" => $no_tls || $no_ocsp,
|
2016-09-19 13:08:58 +00:00
|
|
|
"16-dtls-certstatus.conf" => $no_dtls || $no_ocsp,
|
2018-02-09 10:19:14 +00:00
|
|
|
"17-renegotiate.conf" => $no_tls_below1_3,
|
2016-09-27 11:24:47 +00:00
|
|
|
"18-dtls-renegotiate.conf" => $no_dtls,
|
2016-12-25 16:57:32 +00:00
|
|
|
"19-mac-then-encrypt.conf" => $no_pre_tls1_3,
|
2017-01-21 13:44:52 +00:00
|
|
|
"20-cert-select.conf" => disabled("tls1_2") || $no_ec,
|
2017-02-15 09:25:52 +00:00
|
|
|
"21-key-update.conf" => disabled("tls1_3"),
|
2017-03-01 12:11:51 +00:00
|
|
|
"22-compression.conf" => disabled("zlib") || $no_tls,
|
2017-03-14 12:48:54 +00:00
|
|
|
"23-srp.conf" => (disabled("tls1") && disabled ("tls1_1")
|
|
|
|
&& disabled("tls1_2")) || disabled("srp"),
|
2017-04-05 16:35:25 +00:00
|
|
|
"24-padding.conf" => disabled("tls1_3"),
|
2017-12-10 10:15:34 +00:00
|
|
|
"25-cipher.conf" => disabled("ec") || disabled("tls1_2"),
|
Add TLSv1.3 post-handshake authentication (PHA)
Add SSL_verify_client_post_handshake() for servers to initiate PHA
Add SSL_force_post_handshake_auth() for clients that don't have certificates
initially configured, but use a certificate callback.
Update SSL_CTX_set_verify()/SSL_set_verify() mode:
* Add SSL_VERIFY_POST_HANDSHAKE to postpone client authentication until after
the initial handshake.
* Update SSL_VERIFY_CLIENT_ONCE now only sends out one CertRequest regardless
of when the certificate authentication takes place; either initial handshake,
re-negotiation, or post-handshake authentication.
Add 'RequestPostHandshake' and 'RequirePostHandshake' SSL_CONF options that
add the SSL_VERIFY_POST_HANDSHAKE to the 'Request' and 'Require' options
Add support to s_client:
* Enabled automatically when cert is configured
* Can be forced enabled via -force_pha
Add support to s_server:
* Use 'c' to invoke PHA in s_server
* Remove some dead code
Update documentation
Update unit tests:
* Illegal use of PHA extension
* TLSv1.3 certificate tests
DTLS and TLS behave ever-so-slightly differently. So, when DTLS1.3 is
implemented, it's PHA support state machine may need to be different.
Add a TODO and a #error
Update handshake context to deal with PHA.
The handshake context for TLSv1.3 post-handshake auth is up through the
ClientFinish message, plus the CertificateRequest message. Subsequent
Certificate, CertificateVerify, and Finish messages are based on this
handshake context (not the Certificate message per se, but it's included
after the hash). KeyUpdate, NewSessionTicket, and prior Certificate
Request messages are not included in post-handshake authentication.
After the ClientFinished message is processed, save off the digest state
for future post-handshake authentication. When post-handshake auth occurs,
copy over the saved handshake context into the "main" handshake digest.
This effectively discards the any KeyUpdate or NewSessionTicket messages
and any prior post-handshake authentication.
This, of course, assumes that the ID-22 did not mean to include any
previous post-handshake authentication into the new handshake transcript.
This is implied by section 4.4.1 that lists messages only up to the
first ClientFinished.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4964)
2017-12-18 21:52:28 +00:00
|
|
|
"26-tls13_client_auth.conf" => disabled("tls1_3"),
|
2016-06-03 15:49:04 +00:00
|
|
|
);
|
2016-03-17 14:14:30 +00:00
|
|
|
|
|
|
|
foreach my $conf (@conf_files) {
|
|
|
|
subtest "Test configuration $conf" => sub {
|
2016-04-09 09:15:16 +00:00
|
|
|
test_conf($conf,
|
2016-06-03 15:49:04 +00:00
|
|
|
$conf_dependent_tests{$conf} || $^O eq "VMS" ? 0 : 1,
|
2016-08-02 11:27:39 +00:00
|
|
|
defined($skip{$conf}) ? $skip{$conf} : $no_tls);
|
2016-03-17 14:14:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
sub test_conf {
|
|
|
|
plan tests => 3;
|
|
|
|
|
2016-06-03 15:49:04 +00:00
|
|
|
my ($conf, $check_source, $skip) = @_;
|
2016-03-17 14:14:30 +00:00
|
|
|
|
|
|
|
my $conf_file = srctop_file("test", "ssl-tests", $conf);
|
|
|
|
my $tmp_file = "${conf}.$$.tmp";
|
|
|
|
my $run_test = 1;
|
|
|
|
|
|
|
|
SKIP: {
|
|
|
|
# "Test" 1. Generate the source.
|
|
|
|
my $input_file = $conf_file . ".in";
|
|
|
|
|
|
|
|
skip 'failure', 2 unless
|
|
|
|
ok(run(perltest(["generate_ssl_tests.pl", $input_file],
|
2017-08-01 20:10:39 +00:00
|
|
|
interpreter_args => [ "-I", srctop_dir("util", "perl")],
|
2016-03-17 14:14:30 +00:00
|
|
|
stdout => $tmp_file)),
|
|
|
|
"Getting output from generate_ssl_tests.pl.");
|
|
|
|
|
|
|
|
SKIP: {
|
|
|
|
# Test 2. Compare against existing output in test/ssl_tests.conf.
|
|
|
|
skip "Skipping generated source test for $conf", 1
|
|
|
|
if !$check_source;
|
|
|
|
|
|
|
|
$run_test = is(cmp_text($tmp_file, $conf_file), 0,
|
|
|
|
"Comparing generated sources.");
|
|
|
|
}
|
|
|
|
|
|
|
|
# Test 3. Run the test.
|
2016-06-03 15:49:04 +00:00
|
|
|
skip "No tests available; skipping tests", 1 if $skip;
|
2016-03-17 14:14:30 +00:00
|
|
|
skip "Stale sources; skipping tests", 1 if !$run_test;
|
|
|
|
|
|
|
|
ok(run(test(["ssl_test", $tmp_file])), "running ssl_test $conf");
|
|
|
|
}
|
|
|
|
|
|
|
|
unlink glob $tmp_file;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub cmp_text {
|
|
|
|
return compare_text(@_, sub {
|
|
|
|
$_[0] =~ s/\R//g;
|
|
|
|
$_[1] =~ s/\R//g;
|
|
|
|
return $_[0] ne $_[1];
|
|
|
|
});
|
|
|
|
}
|