diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-03-10 15:04:46 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-03-11 17:40:47 +0000 |
| commit | a6eb1ce6a989d01bb00e9749789b690744be506c (patch) | |
| tree | c4071e00c47ba6c7fc91a50d26d36052edf134d8 /crypto/pkcs12/p12_p8d.c | |
| parent | bb26842d1c8f99c1267b45361a2fc76822c0f913 (diff) | |
Make X509_SIG opaque.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/pkcs12/p12_p8d.c')
| -rw-r--r-- | crypto/pkcs12/p12_p8d.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_p8d.c b/crypto/pkcs12/p12_p8d.c index 9bdfd3f77f..8980abe9b9 100644 --- a/crypto/pkcs12/p12_p8d.c +++ b/crypto/pkcs12/p12_p8d.c @@ -63,7 +63,10 @@ PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen) { - return PKCS12_item_decrypt_d2i(p8->algor, + X509_ALGOR *dalg; + ASN1_OCTET_STRING *doct; + X509_SIG_get0(&dalg, &doct, p8); + return PKCS12_item_decrypt_d2i(dalg, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, - passlen, p8->digest, 1); + passlen, doct, 1); } |