summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12/p12_decr.c
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>1999-04-16 18:13:27 +0000
committerBen Laurie <ben@openssl.org>1999-04-16 18:13:27 +0000
commitc5db363e1b75f8452e4c888402a8ecb291b13838 (patch)
treeb7c2b8078f77d9cfadc7d1343eea2bc08a8acdea /crypto/pkcs12/p12_decr.c
parentddb25f88c22aba88da94602c383180042e29a81c (diff)
Fix some warnings. Contributed by Anonymous.
Diffstat (limited to 'crypto/pkcs12/p12_decr.c')
-rw-r--r--crypto/pkcs12/p12_decr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index d28e886057..5dee184c7b 100644
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -122,8 +122,10 @@ int passlen;
ASN1_OCTET_STRING *oct;
int seq;
{
- unsigned char *out, *p, *ret;
+ unsigned char *out, *p;
+ char *ret;
int outlen;
+
if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length,
&out, &outlen, 0)) {
PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);