projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eabb301
)
Fix merge problem in d2i_PrivateKey_ex
author
Shane Lontis
<shane.lontis@oracle.com>
Fri, 19 Feb 2021 09:43:16 +0000
(19:43 +1000)
committer
Shane Lontis
<shane.lontis@oracle.com>
Fri, 19 Feb 2021 09:43:16 +0000
(19:43 +1000)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14243)
crypto/asn1/d2i_pr.c
patch
|
blob
|
history
diff --git
a/crypto/asn1/d2i_pr.c
b/crypto/asn1/d2i_pr.c
index 21ae90e8e29f72a2c8eb2a7b97657aced00f4b5e..c657f0f3a744e30da5c4c46b10366c56b33afb58 100644
(file)
--- a/
crypto/asn1/d2i_pr.c
+++ b/
crypto/asn1/d2i_pr.c
@@
-44,9
+44,9
@@
EVP_PKEY *d2i_PrivateKey_ex(int keytype, EVP_PKEY **a, const unsigned char **pp,
ppkey = a;
for (i = 0; i < (int)OSSL_NELEM(input_structures); ++i) {
- dctx = OSSL_DECODER_CTX_new_
by_EVP_PKEY
(ppkey, "DER",
-
input_structures[i], key_name,
-
EVP_PKEY_KEYPAIR, libctx, propq);
+ dctx = OSSL_DECODER_CTX_new_
for_pkey
(ppkey, "DER",
+ input_structures[i], key_name,
+ EVP_PKEY_KEYPAIR, libctx, propq);
if (dctx == NULL)
return NULL;