]> git.ipfire.org Git - thirdparty/openssl.git/commit
Handle PBMAC1 with absent PBKDF2 PRF
authorOlivier Chéron <olivier.cheron@gmail.com>
Sun, 29 Sep 2024 15:50:08 +0000 (17:50 +0200)
committerTomas Mraz <tomas@openssl.org>
Mon, 7 Oct 2024 15:52:17 +0000 (17:52 +0200)
commit7aa93a6008f2828fe96d8c126038e9dd6c8171b5
tree98ad59dfe6f6560a9ca3f48fd5b3bc504f85ec9b
parent3c6834da414002f462e5b348c0f78a34e8779521
Handle PBMAC1 with absent PBKDF2 PRF

PRF in PBKDF2-params is optional and defaults to hmacWithSHA1.

CLA: trivial

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 f3652dff2faab0c0a197fa140984103c0b0a5e88)
apps/pkcs12.c
crypto/pkcs12/p12_mutl.c