diff options
| author | jsing <> | 2014-07-08 09:27:21 +0000 |
|---|---|---|
| committer | jsing <> | 2014-07-08 09:27:21 +0000 |
| commit | d3dceafe46f05ecfc9d781a93e80e2dc3f3e74dd (patch) | |
| tree | 409c0b44a7b284edd7b6c33a78ddea6b836a5044 /src/lib/libcrypto/pkcs12/p12_p8d.c | |
| parent | 37d64e6f3e204cc0f5cb7ace93ca844fd9b9306f (diff) | |
| download | openbsd-d3dceafe46f05ecfc9d781a93e80e2dc3f3e74dd.tar.gz openbsd-d3dceafe46f05ecfc9d781a93e80e2dc3f3e74dd.tar.bz2 openbsd-d3dceafe46f05ecfc9d781a93e80e2dc3f3e74dd.zip | |
KNF.
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_p8d.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_p8d.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_p8d.c b/src/lib/libcrypto/pkcs12/p12_p8d.c index f6a333baa5..4aceae6a9f 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.3 2014/06/12 15:49:30 deraadt Exp $ */ | 1 | /* $OpenBSD: p12_p8d.c,v 1.4 2014/07/08 09:24:53 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 | */ |
| @@ -10,7 +10,7 @@ | |||
| 10 | * are met: | 10 | * are met: |
| 11 | * | 11 | * |
| 12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright |
| 13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. |
| 14 | * | 14 | * |
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | 15 | * 2. Redistributions in binary form must reproduce the above copyright |
| 16 | * notice, this list of conditions and the following disclaimer in | 16 | * notice, this list of conditions and the following disclaimer in |
| @@ -60,9 +60,9 @@ | |||
| 60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
| 61 | #include <openssl/pkcs12.h> | 61 | #include <openssl/pkcs12.h> |
| 62 | 62 | ||
| 63 | PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen) | 63 | PKCS8_PRIV_KEY_INFO * |
| 64 | PKCS8_decrypt(X509_SIG *p8, const char *pass, int passlen) | ||
| 64 | { | 65 | { |
| 65 | return PKCS12_item_decrypt_d2i(p8->algor, ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, | 66 | return PKCS12_item_decrypt_d2i(p8->algor, |
| 66 | passlen, p8->digest, 1); | 67 | ASN1_ITEM_rptr(PKCS8_PRIV_KEY_INFO), pass, passlen, p8->digest, 1); |
| 67 | } | 68 | } |
| 68 | |||
