summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_p8d.c
diff options
context:
space:
mode:
authorjsing <>2016-12-30 15:38:13 +0000
committerjsing <>2016-12-30 15:38:13 +0000
commit839da8fff8567f7cd4ca2db04b35ff34048ddb4c (patch)
tree504f0cb89b43c50cb0a2a5677649170a8b6c460e /src/lib/libcrypto/pkcs12/p12_p8d.c
parentc592ddf845454b07eca995ae32ea87dc1eeb9719 (diff)
downloadopenbsd-839da8fff8567f7cd4ca2db04b35ff34048ddb4c.tar.gz
openbsd-839da8fff8567f7cd4ca2db04b35ff34048ddb4c.tar.bz2
openbsd-839da8fff8567f7cd4ca2db04b35ff34048ddb4c.zip
Expand ASN1_ITEM_rptr macros - no change in generated assembly.
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_p8d.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_p8d.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_p8d.c b/src/lib/libcrypto/pkcs12/p12_p8d.c
index 5d3339e2f2..68af6bf5b5 100644
--- a/src/lib/libcrypto/pkcs12/p12_p8d.c
+++ b/src/lib/libcrypto/pkcs12/p12_p8d.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_p8d.c,v 1.5 2014/07/11 08:44:49 jsing Exp $ */ 1/* $OpenBSD: p12_p8d.c,v 1.6 2016/12/30 15:34:35 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2001. 3 * project 2001.
4 */ 4 */
@@ -64,5 +64,5 @@ PKCS8_PRIV_KEY_INFO *
64PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen) 64PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen)
65{ 65{
66 return PKCS12_item_decrypt_d2i(p8->algor, 66 return PKCS12_item_decrypt_d2i(p8->algor,
67 ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8->digest, 1); 67 &PKCS8_PRIV_KEY_INFO_it, pass, passlen, p8->digest, 1);
68} 68}