#! /usr/bin/env perl
-# Copyright 2015-2020 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
use lib srctop_dir('Configurations');
use lib bldtop_dir('.');
-use platform;
my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
my $no_legacy = disabled('legacy') || ($ENV{NO_LEGACY} // 0);
+my $no_des = disabled("des");
my $no_dh = disabled("dh");
my $no_dsa = disabled("dsa");
my $no_ec = disabled("ec");
-my $no_gost = disabled("gost");
+my $no_ec2m = disabled("ec2m");
my $no_sm2 = disabled("sm2");
+my $no_siv = disabled("siv");
+my $no_argon2 = disabled("argon2");
# Default config depends on if the legacy module is built or not
my $defaultcnf = $no_legacy ? 'default.cnf' : 'default-and-legacy.cnf';
my @files = qw(
evpciph_aes_ccm_cavs.txt
evpciph_aes_common.txt
- evpciph_aes_cts1.txt
+ evpciph_aes_cts.txt
evpciph_aes_wrap.txt
+ evpciph_aes_stitched.txt
evpciph_des3_common.txt
evpkdf_hkdf.txt
+ evpkdf_kbkdf_counter.txt
+ evpkdf_kbkdf_kmac.txt
+ evpkdf_pbkdf1.txt
evpkdf_pbkdf2.txt
evpkdf_ss.txt
evpkdf_ssh.txt
evpkdf_tls12_prf.txt
+ evpkdf_tls13_kdf.txt
evpkdf_x942.txt
evpkdf_x963.txt
evpmac_common.txt
evppkey_rsa_common.txt
evprand.txt
);
-push @files, qw(evppkey_ffdhe.txt) unless $no_dh;
+push @files, qw(
+ evppkey_ffdhe.txt
+ evppkey_dh.txt
+ ) unless $no_dh;
+push @files, qw(
+ evpkdf_x942_des.txt
+ evpmac_cmac_des.txt
+ ) unless $no_des;
push @files, qw(evppkey_dsa.txt) unless $no_dsa;
push @files, qw(evppkey_ecx.txt) unless $no_ec;
push @files, qw(
evppkey_ecdsa.txt
evppkey_kas.txt
evppkey_mismatch.txt
- ) unless $no_ec || $no_gost;
+ ) unless $no_ec;
# A list of tests that only run with the default provider
# (i.e. The algorithms are not present in the fips provider)
my @defltfiles = qw(
- evpciph_aes_cts23.txt
evpciph_aes_ocb.txt
- evpciph_aes_siv.txt
evpciph_aria.txt
evpciph_bf.txt
evpciph_camellia.txt
+ evpciph_camellia_cts.txt
evpciph_cast5.txt
evpciph_chacha.txt
evpciph_des.txt
evpciph_idea.txt
evpciph_rc2.txt
evpciph_rc4.txt
+ evpciph_rc4_stitched.txt
evpciph_rc5.txt
evpciph_seed.txt
evpciph_sm4.txt
evpkdf_krb5.txt
evpkdf_scrypt.txt
evpkdf_tls11_prf.txt
+ evpkdf_hmac_drbg.txt
evpmac_blake.txt
evpmac_poly1305.txt
evpmac_siphash.txt
+ evpmac_sm3.txt
evpmd_blake.txt
evpmd_md.txt
evpmd_mdc2.txt
evppkey_rsa.txt
);
push @defltfiles, qw(evppkey_brainpool.txt) unless $no_ec;
+push @defltfiles, qw(evppkey_ecdsa_rfc6979.txt) unless $no_ec;
+push @defltfiles, qw(evppkey_dsa_rfc6979.txt) unless $no_dsa;
push @defltfiles, qw(evppkey_sm2.txt) unless $no_sm2;
+push @defltfiles, qw(evpciph_aes_gcm_siv.txt) unless $no_siv;
+push @defltfiles, qw(evpciph_aes_siv.txt) unless $no_siv;
+push @defltfiles, qw(evpkdf_argon2.txt) unless $no_argon2;
plan tests =>
- ($no_fips ? 0 : 1) # FIPS install test
+ (scalar(@configs) * scalar(@files))
+ scalar(@defltfiles)
+ 3; # error output tests
-unless ($no_fips) {
- my $infile = bldtop_file('providers', platform->dso('fips'));
-
- ok(run(app(['openssl', 'fipsinstall',
- '-out', bldtop_file('providers', 'fipsmodule.cnf'),
- '-module', $infile])),
- "fipsinstall");
-}
-
foreach (@configs) {
my $conf = srctop_file("test", $_);
"running evp_test -config $conf $f");
}
+# test_errors OPTIONS
+#
+# OPTIONS may include:
+#
+# key => "filename" # expected to be found in $SRCDIR/test/certs
+# out => "filename" # file to write error strings to
+# args => [ ... extra openssl pkey args ... ]
+# expected => regexps to match error lines against
sub test_errors { # actually tests diagnostics of OSSL_STORE
- my ($expected, $key, @opts) = @_;
- my $infile = srctop_file('test', 'certs', $key);
- my @args = qw(openssl pkey -in);
- push(@args, $infile, @opts);
- my $tmpfile = 'out.txt';
- my $res = !run(app([@args], stderr => $tmpfile));
- my $found = 0;
- open(my $in, '<', $tmpfile) or die "Could not open file $tmpfile";
- while(<$in>) {
- print; # this may help debugging
- $res &&= !m/asn1 encoding/; # output must not include ASN.1 parse errors
- $found = 1 if m/$expected/; # output must include $expected
+ my %opts = @_;
+ my $infile = srctop_file('test', 'certs', $opts{key});
+ my @args = ( qw(openssl pkey -in), $infile, @{$opts{args} // []} );
+ my $res = !run(app([@args], stderr => $opts{out}));
+ my $found = !exists $opts{expected};
+ open(my $in, '<', $opts{out}) or die "Could not open file $opts{out}";
+ while(my $errline = <$in>) {
+ print $errline; # this may help debugging
+
+ # output must not include ASN.1 parse errors
+ $res &&= $errline !~ m/asn1 encoding/;
+ # output must include what is expressed in $opts{$expected}
+ $found = 1
+ if exists $opts{expected} && $errline =~ m/$opts{expected}/;
}
close $in;
# $tmpfile is kept to help with investigation in case of failure
SKIP: {
skip "DSA not disabled", 2 if !disabled("dsa");
- ok(test_errors("unsupported algorithm", "server-dsa-key.pem"),
- "error loading unsupported dsa private key");
- ok(test_errors("unsupported algorithm", "server-dsa-pubkey.pem", "-pubin"),
- "error loading unsupported dsa public key");
+ ok(test_errors(key => 'server-dsa-key.pem',
+ out => 'server-dsa-key.err'),
+ "expected error loading unsupported dsa private key");
+ ok(test_errors(key => 'server-dsa-pubkey.pem',
+ out => 'server-dsa-pubkey.err',
+ args => [ '-pubin' ],
+ expected => 'unsupported'),
+ "expected error loading unsupported dsa public key");
}
SKIP: {
- skip "sm2 not disabled", 1 if !disabled("sm2");
+ skip "SM2 not disabled", 1 if !disabled("sm2");
- ok(test_errors("unknown group|unsupported algorithm", "sm2.key"),
- "error loading unsupported sm2 private key");
+ ok(test_errors(key => 'sm2.key', out => 'sm2.err'),
+ "expected error loading unsupported sm2 private key");
}
projects / thirdparty / openssl.git / blobdiff