From 80a31435e5a0cf1ccd2d7369f6c43319bce5b9a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Ch=C3=A9ron?= Date: Mon, 30 Sep 2024 21:44:28 +0200 Subject: [PATCH] Test PBMAC1 with absent PBKDF2 PRF Reviewed-by: Dmitry Belyavskiy Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/25568) --- test/recipes/80-test_pkcs12.t | 10 +++++++++- .../pbmac1_sha1_hmac_and_prf.p12 | Bin 0 -> 2693 bytes 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 test/recipes/80-test_pkcs12_data/pbmac1_sha1_hmac_and_prf.p12 diff --git a/test/recipes/80-test_pkcs12.t b/test/recipes/80-test_pkcs12.t index 9fcfa965429..616de23ffbe 100644 --- a/test/recipes/80-test_pkcs12.t +++ b/test/recipes/80-test_pkcs12.t @@ -56,7 +56,7 @@ $ENV{OPENSSL_WIN32_UTF8}=1; 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 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 my $bad1 = srctop_file("test", "recipes", "80-test_pkcs12_data", "bad1.p12"); my $bad2 = srctop_file("test", "recipes", "80-test_pkcs12_data", "bad2.p12"); diff --git a/test/recipes/80-test_pkcs12_data/pbmac1_sha1_hmac_and_prf.p12 b/test/recipes/80-test_pkcs12_data/pbmac1_sha1_hmac_and_prf.p12 new file mode 100644 index 0000000000000000000000000000000000000000..d0fe88ca9b2a48ecadbd26e74a71420e5d1147e5 GIT binary patch literal 2693 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 B&w&5{ literal 0 Hc-jL100001 -- 2.47.2