453dfd8d5e
Currently, SSL tests are configured via command-line switches to ssltest.c. This results in a lot of duplication between ssltest.c and apps, and a complex setup. ssltest.c is also simply old and needs maintenance. Instead, we already have a way to configure SSL servers and clients, so we leverage that. SSL tests can now be configured from a configuration file. Test servers and clients are configured using the standard ssl_conf module. Additional test settings are configured via a test configuration. Moreover, since the CONF language involves unnecessary boilerplate, the test conf itself is generated from a shorter Perl syntax. The generated testcase files are checked in to the repo to make it easier to verify that the intended test cases are in fact run; and to simplify debugging failures. To demonstrate the approach, min/max protocol tests are converted to the new format. This change also fixes MinProtocol and MaxProtocol handling. It was previously requested that an SSL_CTX have both the server and client flags set for these commands; this clearly can never work. Guide to this PR: - test/ssl_test.c - test framework - test/ssl_test_ctx.* - test configuration structure - test/handshake_helper.* - new SSL test handshaking code - test/ssl-tests/ - test configurations - test/generate_ssl_tests.pl - script for generating CONF-style test configurations from perl inputs Reviewed-by: Richard Levitte <levitte@openssl.org>
105 lines
2.5 KiB
Perl
105 lines
2.5 KiB
Perl
#! /usr/bin/perl
|
|
# -*- mode: perl; -*-
|
|
|
|
## SSL testcase generator
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use File::Basename;
|
|
use File::Spec::Functions;
|
|
|
|
use OpenSSL::Test qw/srctop_dir srctop_file/;
|
|
use OpenSSL::Test::Utils;
|
|
|
|
# This block needs to run before 'use lib srctop_dir' directives.
|
|
BEGIN {
|
|
OpenSSL::Test::setup("no_test_here");
|
|
}
|
|
|
|
use lib srctop_dir("util"); # for with_fallback
|
|
use lib srctop_dir("test", "ssl-tests"); # for ssltests_base
|
|
|
|
use with_fallback qw(Text::Template);
|
|
|
|
use vars qw/@ISA/;
|
|
push (@ISA, qw/Text::Template/);
|
|
|
|
use ssltests_base;
|
|
|
|
sub print_templates {
|
|
my $source = srctop_file("test", "ssl_test.tmpl");
|
|
my $template = Text::Template->new(TYPE => 'FILE', SOURCE => $source);
|
|
|
|
print "# Generated with generate_ssl_tests.pl\n\n";
|
|
|
|
my $num = scalar @ssltests::tests;
|
|
|
|
# Add the implicit base configuration.
|
|
foreach my $test (@ssltests::tests) {
|
|
$test->{"server"} = { (%ssltests::base_server, %{$test->{"server"}}) };
|
|
$test->{"client"} = { (%ssltests::base_client, %{$test->{"client"}}) };
|
|
}
|
|
|
|
# ssl_test expects to find a
|
|
#
|
|
# num_tests = n
|
|
#
|
|
# directive in the file. It'll then look for configuration directives
|
|
# for n tests, that each look like this:
|
|
#
|
|
# test-n = test-section
|
|
#
|
|
# [test-section]
|
|
# (SSL modules for client and server configuration go here.)
|
|
#
|
|
# [test-n]
|
|
# (Test configuration goes here.)
|
|
print "num_tests = $num\n\n";
|
|
|
|
# The conf module locations must come before everything else, because
|
|
# they look like
|
|
#
|
|
# test-n = test-section
|
|
#
|
|
# and you can't mix and match them with sections.
|
|
my $idx = 0;
|
|
|
|
foreach my $test (@ssltests::tests) {
|
|
my $testname = "${idx}-" . $test->{'name'};
|
|
print "test-$idx = $testname\n";
|
|
$idx++;
|
|
}
|
|
|
|
$idx = 0;
|
|
|
|
foreach my $test (@ssltests::tests) {
|
|
my $testname = "${idx}-" . $test->{'name'};
|
|
my $text = $template->fill_in(
|
|
HASH => [{ idx => $idx, testname => $testname } , $test],
|
|
DELIMITERS => [ "{-", "-}" ]);
|
|
print "# ===========================================================\n\n";
|
|
print "$text\n";
|
|
$idx++;
|
|
}
|
|
}
|
|
|
|
# Shamelessly copied from Configure.
|
|
sub read_config {
|
|
my $fname = shift;
|
|
open(INPUT, "< $fname")
|
|
or die "Can't open input file '$fname'!\n";
|
|
local $/ = undef;
|
|
my $content = <INPUT>;
|
|
close(INPUT);
|
|
eval $content;
|
|
warn $@ if $@;
|
|
}
|
|
|
|
my $input_file = shift;
|
|
# Reads the tests into ssltests::tests.
|
|
read_config($input_file);
|
|
print_templates();
|
|
|
|
1;
|