]> git.ipfire.org Git - thirdparty/openssl.git/commit
Don't add the first pkcs12 certificate multiple times
authorMatt Caswell <matt@openssl.org>
Mon, 5 Jul 2021 16:19:59 +0000 (17:19 +0100)
committerPauli <pauli@openssl.org>
Fri, 9 Jul 2021 00:24:32 +0000 (10:24 +1000)
commitbe618c7cc18ab0cbaf0538128705de7f60975ad7
treeb1a48bbba576acb8c2446e71ae9cde6223b71600
parent5c8c2e6b484d5845cc26a0b634c872e2d102037a
Don't add the first pkcs12 certificate multiple times

This fixes a regression introduced by commit 1d6c867. When exporting a set
of certificates to a PKCS12 file we shouldn't add the first one twice. Also
we restore historic behaviour with respect to the canames option where we
have no ee certificate with key.

Fixes #15983

Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16001)
apps/pkcs12.c