Fix PKCS#12 creation error when certificate contains auxiliary data
authorOlga Batyshkina <obatysh@gmx.com>
Mon, 7 Aug 2023 13:14:53 +0000 (15:14 +0200)
committerTomas Mraz <tomas@openssl.org>
Fri, 15 Sep 2023 14:17:42 +0000 (16:17 +0200)
commit3558a8c6c41270a1d451d1431a278680667f61e6
tree1f629fd803b0c9feac251427009d051bc0f19812
parent7f81dec985b830db348eb025927f2cd0406b7b7e
Fix PKCS#12 creation error when certificate contains auxiliary data

Prefer friendly name passed by the caller and calculated local
key id to ones found in certificate auxiliary data when creating
PKCS#12.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21675)

(cherry picked from commit 388a8e731445d190a46ec27b2ff5b4bf334d526b)
crypto/pkcs12/p12_crt.c
test/pkcs12_format_test.c