diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-12 18:06:00 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-19 09:50:21 +0200 |
| commit | fc0aae737eb1cb2d2554caa8bffea80b8cbd38f9 (patch) | |
| tree | b1c9a7e0327e77d5f95ccbf30f544fabede325e9 /crypto/pkcs12 | |
| parent | OSSL_STORE file_load_try_decode(): Avoid flooding error queue by failed tries (diff) | |
| download | openssl-fc0aae737eb1cb2d2554caa8bffea80b8cbd38f9.tar.xz openssl-fc0aae737eb1cb2d2554caa8bffea80b8cbd38f9.zip | |
PKCS12_parse(): Fix reversed order of certs parsed and output via *ca
Fixes #6698
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12641)
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_kiss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index eaf6501c1c..4cbf4530ff 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -89,7 +89,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, goto err; } - while ((x = sk_X509_pop(ocerts))) { + while ((x = sk_X509_shift(ocerts))) { if (pkey != NULL && *pkey != NULL && cert != NULL && *cert == NULL) { ERR_set_mark(); |