From 61f5b6f33807306d09bccbc2dcad474d1d04ca40 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Fri, 23 Apr 1999 15:01:15 +0000 Subject: Work with -pedantic! --- crypto/pkcs12/p12_decr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crypto/pkcs12/p12_decr.c') diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c index b96f119b7a..7973a69c2c 100644 --- a/crypto/pkcs12/p12_decr.c +++ b/crypto/pkcs12/p12_decr.c @@ -68,7 +68,7 @@ * Malloc'ed buffer */ -unsigned char * PKCS12_pbe_crypt (X509_ALGOR *algor, unsigned char *pass, +unsigned char * PKCS12_pbe_crypt (X509_ALGOR *algor, const char *pass, int passlen, unsigned char *in, int inlen, unsigned char **data, int *datalen, int en_de) { @@ -107,7 +107,7 @@ unsigned char * PKCS12_pbe_crypt (X509_ALGOR *algor, unsigned char *pass, */ char * PKCS12_decrypt_d2i (X509_ALGOR *algor, char * (*d2i)(), - void (*free_func)(), unsigned char *pass, int passlen, + void (*free_func)(), const char *pass, int passlen, ASN1_OCTET_STRING *oct, int seq) { unsigned char *out, *p; @@ -115,7 +115,7 @@ char * PKCS12_decrypt_d2i (X509_ALGOR *algor, char * (*d2i)(), int outlen; if (!PKCS12_pbe_crypt (algor, pass, passlen, oct->data, oct->length, - &out, &outlen, 0)) { + &out, &outlen, 0)) { PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR); return NULL; } @@ -147,7 +147,8 @@ char * PKCS12_decrypt_d2i (X509_ALGOR *algor, char * (*d2i)(), */ ASN1_OCTET_STRING *PKCS12_i2d_encrypt (X509_ALGOR *algor, int (*i2d)(), - unsigned char *pass, int passlen, char *obj, int seq) + const char *pass, int passlen, + char *obj, int seq) { ASN1_OCTET_STRING *oct; unsigned char *in, *p; -- cgit v1.2.3