[openssl/openssl] cdc4f2: Fix PKCS#12 creation error when certificate contai...

[Olga Batyshkina]

  Branch: refs/heads/openssl-3.1
  Home:   https://github.com/openssl/openssl
  Commit: cdc4f2b5072f908e88e3aae83d87a7d095d2b36a
      https://github.com/openssl/openssl/commit/cdc4f2b5072f908e88e3aae83d87a7d095d2b36a
  Author: Olga Batyshkina <obatysh at gmx.com>
  Date:   2023-09-15 (Fri, 15 Sep 2023)

  Changed paths:
    M crypto/pkcs12/p12_crt.c
    M test/pkcs12_format_test.c

  Log Message:
  -----------
  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 at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21675)

(cherry picked from commit 388a8e731445d190a46ec27b2ff5b4bf334d526b)