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:06:25 +0000 (16:06 +0200)
commit388a8e731445d190a46ec27b2ff5b4bf334d526b
tree97c988231c99e50e84b9460fc3f487c225e80f74
parented4a71d18d939f557b430c4369d118b55c1c0b6c
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)
crypto/pkcs12/p12_crt.c
test/pkcs12_format_test.c