Test PBMAC1 with absent PBKDF2 PRF
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25568)
(cherry picked from commit 80a31435e5
)
This commit is contained in:
parent
7aa93a6008
commit
13f371664d
2 changed files with 9 additions and 1 deletions
|
@ -56,7 +56,7 @@ $ENV{OPENSSL_WIN32_UTF8}=1;
|
||||||
|
|
||||||
my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
|
my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
|
||||||
|
|
||||||
plan tests => $no_fips ? 45 : 51;
|
plan tests => $no_fips ? 46 : 52;
|
||||||
|
|
||||||
# Test different PKCS#12 formats
|
# Test different PKCS#12 formats
|
||||||
ok(run(test(["pkcs12_format_test"])), "test pkcs12 formats");
|
ok(run(test(["pkcs12_format_test"])), "test pkcs12 formats");
|
||||||
|
@ -247,6 +247,14 @@ for my $file ("pbmac1_256_256.bad-iter.p12", "pbmac1_256_256.bad-salt.p12", "pbm
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Test pbmac1 pkcs12 file with absent PBKDF2 PRF, usually omitted when selecting sha1
|
||||||
|
{
|
||||||
|
my $file = "pbmac1_sha1_hmac_and_prf.p12";
|
||||||
|
my $path = srctop_file("test", "recipes", "80-test_pkcs12_data", $file);
|
||||||
|
ok(run(app(["openssl", "pkcs12", "-in", $path, "-password", "pass:1234", "-noenc"])),
|
||||||
|
"test pbmac1 pkcs12 file $file");
|
||||||
|
}
|
||||||
|
|
||||||
# Test some bad pkcs12 files
|
# Test some bad pkcs12 files
|
||||||
my $bad1 = srctop_file("test", "recipes", "80-test_pkcs12_data", "bad1.p12");
|
my $bad1 = srctop_file("test", "recipes", "80-test_pkcs12_data", "bad1.p12");
|
||||||
my $bad2 = srctop_file("test", "recipes", "80-test_pkcs12_data", "bad2.p12");
|
my $bad2 = srctop_file("test", "recipes", "80-test_pkcs12_data", "bad2.p12");
|
||||||
|
|
BIN
test/recipes/80-test_pkcs12_data/pbmac1_sha1_hmac_and_prf.p12
Normal file
BIN
test/recipes/80-test_pkcs12_data/pbmac1_sha1_hmac_and_prf.p12
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue