diff options
| author | jsing <> | 2016-12-30 15:38:13 +0000 |
|---|---|---|
| committer | jsing <> | 2016-12-30 15:38:13 +0000 |
| commit | d4b09bfd41d8d40b82b197b4ec8b0232cd6ee1fa (patch) | |
| tree | 504f0cb89b43c50cb0a2a5677649170a8b6c460e /src/lib/libcrypto/pkcs12/p12_p8d.c | |
| parent | 9abb4e3e6af169bb9250abceb9ac5f988efd027d (diff) | |
| download | openbsd-d4b09bfd41d8d40b82b197b4ec8b0232cd6ee1fa.tar.gz openbsd-d4b09bfd41d8d40b82b197b4ec8b0232cd6ee1fa.tar.bz2 openbsd-d4b09bfd41d8d40b82b197b4ec8b0232cd6ee1fa.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.c | 4 |
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 * | |||
| 64 | PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen) | 64 | PKCS8_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 | } |
