summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pkcs12/p12_decr.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_decr.c')
-rw-r--r--src/lib/libcrypto/pkcs12/p12_decr.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index ca08ee55d5..1ef5c4a898 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_decr.c,v 1.18 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: p12_decr.c,v 1.19 2018/05/13 14:22:34 tb 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 1999. 3 * project 1999.
4 */ 4 */
@@ -67,8 +67,9 @@
67 */ 67 */
68 68
69unsigned char * 69unsigned char *
70PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass, int passlen, 70PKCS12_pbe_crypt(const X509_ALGOR *algor, const char *pass, int passlen,
71 unsigned char *in, int inlen, unsigned char **data, int *datalen, int en_de) 71 const unsigned char *in, int inlen, unsigned char **data, int *datalen,
72 int en_de)
72{ 73{
73 unsigned char *out; 74 unsigned char *out;
74 int outlen, i; 75 int outlen, i;
@@ -119,8 +120,8 @@ err:
119 */ 120 */
120 121
121void * 122void *
122PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, 123PKCS12_item_decrypt_d2i(const X509_ALGOR *algor, const ASN1_ITEM *it,
123 const char *pass, int passlen, ASN1_OCTET_STRING *oct, int zbuf) 124 const char *pass, int passlen, const ASN1_OCTET_STRING *oct, int zbuf)
124{ 125{
125 unsigned char *out; 126 unsigned char *out;
126 const unsigned char *p; 127 const unsigned char *p;