Work with -pedantic!

11 files changed, 93 insertions, 68 deletions

diff --git a/crypto/pkcs12/Makefile.ssl b/crypto/pkcs12/Makefile.ssl
index ff016d534e..e6e06a5b46 100644
--- a/crypto/pkcs12/Makefile.ssl
+++ b/crypto/pkcs12/Makefile.ssl
@@ -99,8 +99,8 @@ p12_add.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 p12_add.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_add.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
 p12_add.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-p12_add.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
-p12_add.o: pkcs12.h
+p12_add.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h
+p12_add.o: ../opensslv.h pkcs12.h
 p12_attr.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_attr.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_attr.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -111,7 +111,7 @@ p12_attr.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_attr.o: ../../include/ripemd.h ../../include/rsa.h
 p12_attr.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_attr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_attr.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_attr.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_bags.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 p12_bags.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 p12_bags.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -122,7 +122,7 @@ p12_bags.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 p12_bags.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 p12_bags.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_bags.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_bags.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_bags.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_crpt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_crpt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_crpt.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -133,7 +133,7 @@ p12_crpt.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_crpt.o: ../../include/ripemd.h ../../include/rsa.h
 p12_crpt.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_crpt.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_crpt.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_crpt.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_crt.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_crt.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_crt.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -143,8 +143,8 @@ p12_crt.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 p12_crt.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_crt.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
 p12_crt.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-p12_crt.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
-p12_crt.o: pkcs12.h
+p12_crt.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h
+p12_crt.o: ../opensslv.h pkcs12.h
 p12_decr.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_decr.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_decr.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -155,7 +155,7 @@ p12_decr.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_decr.o: ../../include/ripemd.h ../../include/rsa.h
 p12_decr.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_decr.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_decr.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_decr.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_init.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_init.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_init.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -166,7 +166,7 @@ p12_init.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_init.o: ../../include/ripemd.h ../../include/rsa.h
 p12_init.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_init.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_init.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_init.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_key.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_key.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_key.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -176,8 +176,8 @@ p12_key.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 p12_key.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_key.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
 p12_key.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-p12_key.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
-p12_key.o: pkcs12.h
+p12_key.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h
+p12_key.o: ../opensslv.h pkcs12.h
 p12_kiss.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_kiss.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_kiss.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -188,7 +188,7 @@ p12_kiss.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_kiss.o: ../../include/ripemd.h ../../include/rsa.h
 p12_kiss.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_kiss.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_kiss.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_kiss.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_lib.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 p12_lib.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 p12_lib.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -199,7 +199,7 @@ p12_lib.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 p12_lib.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 p12_lib.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_lib.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_lib.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_lib.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_mac.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 p12_mac.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 p12_mac.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -210,7 +210,7 @@ p12_mac.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 p12_mac.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 p12_mac.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_mac.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_mac.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_mac.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_mutl.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_mutl.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_mutl.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -221,7 +221,7 @@ p12_mutl.o: ../../include/pkcs7.h ../../include/rand.h ../../include/rc2.h
 p12_mutl.o: ../../include/rc4.h ../../include/rc5.h ../../include/ripemd.h
 p12_mutl.o: ../../include/rsa.h ../../include/safestack.h ../../include/sha.h
 p12_mutl.o: ../../include/stack.h ../../include/x509.h ../../include/x509_vfy.h
-p12_mutl.o: ../cryptlib.h ../crypto.h ../opensslv.h pkcs12.h
+p12_mutl.o: ../cryptlib.h ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_sbag.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h
 p12_sbag.o: ../../include/blowfish.h ../../include/bn.h ../../include/buffer.h
 p12_sbag.o: ../../include/cast.h ../../include/des.h ../../include/dh.h
@@ -232,7 +232,7 @@ p12_sbag.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 p12_sbag.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 p12_sbag.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 p12_sbag.o: ../../include/x509.h ../../include/x509_vfy.h ../cryptlib.h
-p12_sbag.o: ../crypto.h ../opensslv.h pkcs12.h
+p12_sbag.o: ../crypto.h ../opensslconf.h ../opensslv.h pkcs12.h
 p12_utl.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 p12_utl.o: ../../include/bn.h ../../include/buffer.h ../../include/cast.h
 p12_utl.o: ../../include/des.h ../../include/dh.h ../../include/dsa.h
@@ -242,8 +242,8 @@ p12_utl.o: ../../include/mdc2.h ../../include/objects.h ../../include/pkcs7.h
 p12_utl.o: ../../include/rc2.h ../../include/rc4.h ../../include/rc5.h
 p12_utl.o: ../../include/ripemd.h ../../include/rsa.h ../../include/safestack.h
 p12_utl.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h
-p12_utl.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslv.h
-p12_utl.o: pkcs12.h
+p12_utl.o: ../../include/x509_vfy.h ../cryptlib.h ../crypto.h ../opensslconf.h
+p12_utl.o: ../opensslv.h pkcs12.h
 pk12err.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h
 pk12err.o: ../../include/bn.h ../../include/cast.h ../../include/des.h
 pk12err.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h
@@ -253,4 +253,4 @@ pk12err.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h
 pk12err.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h
 pk12err.o: ../../include/safestack.h ../../include/sha.h ../../include/stack.h
 pk12err.o: ../../include/x509.h ../../include/x509_vfy.h ../crypto.h
-pk12err.o: ../opensslv.h pkcs12.h
+pk12err.o: ../opensslconf.h ../opensslv.h pkcs12.h
diff --git a/crypto/pkcs12/p12_add.c b/crypto/pkcs12/p12_add.c
index 58f4d1f4be..60304ed443 100644
--- a/crypto/pkcs12/p12_add.c
+++ b/crypto/pkcs12/p12_add.c
@@ -101,8 +101,9 @@ PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG (PKCS8_PRIV_KEY_INFO *p8)
 
 /* Turn PKCS8 object into a shrouded keybag */
 
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (pbe_nid, pass, passlen, salt, saltlen, iter, p8)int pbe_nid;
-unsigned char *pass;
+PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG (pbe_nid, pass, passlen, salt, saltlen, iter, p8)
+int pbe_nid;
+const char *pass;
 int passlen;
 unsigned char *salt;
 int saltlen;
@@ -151,7 +152,7 @@ PKCS7 *PKCS12_pack_p7data (STACK *sk)
 
 /* Turn a stack of SAFEBAGS into a PKCS#7 encrypted data ContentInfo */
 
-PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, unsigned char *pass, int passlen,
+PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, const char *pass, int passlen,
 	     unsigned char *salt, int saltlen, int iter, STACK *bags)
 {
 	PKCS7 *p7;
@@ -184,7 +185,7 @@ PKCS7 *PKCS12_pack_p7encdata (int pbe_nid, unsigned char *pass, int passlen,
 	return p7;
 }
 
-X509_SIG *PKCS8_encrypt (int pbe_nid, unsigned char *pass, int passlen,
+X509_SIG *PKCS8_encrypt (int pbe_nid, const char *pass, int passlen,
 	     unsigned char *salt, int saltlen, int iter,
 	     PKCS8_PRIV_KEY_INFO *p8inf)
 {
diff --git a/crypto/pkcs12/p12_attr.c b/crypto/pkcs12/p12_attr.c
index 6247fdb766..c7d13c6219 100644
--- a/crypto/pkcs12/p12_attr.c
+++ b/crypto/pkcs12/p12_attr.c
@@ -145,8 +145,8 @@ int PKCS8_add_keyusage (PKCS8_PRIV_KEY_INFO *p8, int usage)
 
 /* Add a friendlyname to a safebag */
 
-int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, unsigned char *name,
-	     int namelen)
+int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, const char *name,
+				 int namelen)
 {
 	unsigned char *uniname;
 	int ret, unilen;
@@ -160,8 +160,8 @@ int PKCS12_add_friendlyname_asc (PKCS12_SAFEBAG *bag, unsigned char *name,
 }
 	
 
-int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag, unsigned char *name,
-	     int namelen)
+int PKCS12_add_friendlyname_uni (PKCS12_SAFEBAG *bag,
+				 const unsigned char *name, int namelen)
 {
 	X509_ATTRIBUTE *attrib;
 	ASN1_BMPSTRING *bmp;
diff --git a/crypto/pkcs12/p12_crpt.c b/crypto/pkcs12/p12_crpt.c
index 8623cde6c4..8a6fedaeab 100644
--- a/crypto/pkcs12/p12_crpt.c
+++ b/crypto/pkcs12/p12_crpt.c
@@ -78,12 +78,12 @@ EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(),
 					EVP_sha1(), PKCS12_PBE_keyivgen);
 }
 
-int PKCS12_PBE_keyivgen (unsigned char *pass, int passlen, unsigned char *salt,
+int PKCS12_PBE_keyivgen (const char *pass, int passlen, unsigned char *salt,
 	     int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md,
 	     unsigned char *key, unsigned char *iv)
 {
 	if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID,
- 				iter, EVP_CIPHER_key_length(cipher), key, md)) {
+			     iter, EVP_CIPHER_key_length(cipher), key, md)) {
 		PKCS12err(PKCS12_F_PKCS12_PBE_KEYIVGEN,PKCS12_R_KEY_GEN_ERROR);
 		return 0;
 	}
diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index f7592a5767..86445278aa 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -72,7 +72,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 	X509 *tcert;
 	int i;
 	unsigned char keyid[EVP_MAX_MD_SIZE];
-	int keyidlen;
+	unsigned int keyidlen;
 
 	/* Set defaults */
 	if(!nid_cert) nid_cert = NID_pbe_WithSHA1And40BitRC2_CBC;
@@ -115,7 +115,7 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 
 	/* Turn certbags into encrypted authsafe */
 	authsafe = PKCS12_pack_p7encdata (nid_cert, pass, -1, NULL, 0,
-								 iter, bags);
+					  iter, bags);
 	sk_pop_free(bags, PKCS12_SAFEBAG_free);
 
 	if (!authsafe) return NULL;
@@ -151,7 +151,8 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
 
 	sk_pop_free(safes, PKCS7_free);
 
-	if(!PKCS12_set_mac (p12, pass, -1, NULL, 0, mac_iter, NULL)) return NULL;
+	if(!PKCS12_set_mac (p12, pass, -1, NULL, 0, mac_iter, NULL))
+	    return NULL;
 
 	return p12;
 
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;
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index eb774e45f0..b59ac2b2d1 100644
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -74,7 +74,7 @@ void h__dump (unsigned char *p, int len);
 #define min(a,b) ((a) < (b) ? (a) : (b))
 #endif
 
-int PKCS12_key_gen_asc (unsigned char *pass, int passlen, unsigned char *salt,
+int PKCS12_key_gen_asc (const char *pass, int passlen, unsigned char *salt,
 	     int saltlen, int id, int iter, int n, unsigned char *out,
 	     const EVP_MD *md_type)
 {
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c
index b4e3cc88f7..9c40305534 100644
--- a/crypto/pkcs12/p12_kiss.c
+++ b/crypto/pkcs12/p12_kiss.c
@@ -63,9 +63,9 @@
 /* Simplified PKCS#12 routines */
 
 #ifndef NOPROTO
-static int parse_pk12( PKCS12 *p12, unsigned char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca);
-static int parse_bags( STACK *bags, unsigned char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch);
-static int parse_bag( PKCS12_SAFEBAG *bag, unsigned char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch);
+static int parse_pk12( PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca);
+static int parse_bags( STACK *bags, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch);
+static int parse_bag( PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid, char *keymatch);
 #else
 static int parse_pk12();
 static int parse_bags();
@@ -78,7 +78,7 @@ static int parse_bag();
  * passed unitialised.
  */
 
-int PKCS12_parse (PKCS12 *p12, char *pass, EVP_PKEY **pkey, X509 **cert,
+int PKCS12_parse (PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
 	     STACK **ca)
 {
 
@@ -125,7 +125,7 @@ return 0;
 
 /* Parse the outer PKCS#12 structure */
 
-static int parse_pk12 (PKCS12 *p12, unsigned char *pass, int passlen,
+static int parse_pk12 (PKCS12 *p12, const char *pass, int passlen,
 	     EVP_PKEY **pkey, X509 **cert, STACK **ca)
 {
 	STACK *asafes, *bags;
@@ -160,9 +160,9 @@ static int parse_pk12 (PKCS12 *p12, unsigned char *pass, int passlen,
 }
 
 
-static int parse_bags (STACK *bags, unsigned char *pass, int passlen,
-	     EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid,
-	     char *keymatch)
+static int parse_bags (STACK *bags, const char *pass, int passlen,
+		       EVP_PKEY **pkey, X509 **cert, STACK **ca,
+		       ASN1_OCTET_STRING **keyid, char *keymatch)
 {
 	int i;
 	for (i = 0; i < sk_num (bags); i++) {
@@ -177,8 +177,9 @@ static int parse_bags (STACK *bags, unsigned char *pass, int passlen,
 #define MATCH_CERT 0x2
 #define MATCH_ALL  0x3
 
-static int parse_bag (PKCS12_SAFEBAG *bag, unsigned char *pass, int passlen,
-	     EVP_PKEY **pkey, X509 **cert, STACK **ca, ASN1_OCTET_STRING **keyid,
+static int parse_bag (PKCS12_SAFEBAG *bag, const char *pass, int passlen,
+		      EVP_PKEY **pkey, X509 **cert, STACK **ca,
+		      ASN1_OCTET_STRING **keyid,
 	     char *keymatch)
 {
 	PKCS8_PRIV_KEY_INFO *p8;
diff --git a/crypto/pkcs12/p12_mutl.c b/crypto/pkcs12/p12_mutl.c
index 2d16e610d2..1699619cf3 100644
--- a/crypto/pkcs12/p12_mutl.c
+++ b/crypto/pkcs12/p12_mutl.c
@@ -63,8 +63,8 @@
 #include "pkcs12.h"
 
 /* Generate a MAC */
-int PKCS12_gen_mac (PKCS12 *p12, unsigned char *pass, int passlen,
-	     unsigned char *mac, unsigned int *maclen)
+int PKCS12_gen_mac (PKCS12 *p12, const char *pass, int passlen,
+		    unsigned char *mac, unsigned int *maclen)
 {
 	const EVP_MD *md_type;
 	HMAC_CTX hmac;
@@ -92,7 +92,7 @@ int PKCS12_gen_mac (PKCS12 *p12, unsigned char *pass, int passlen,
 }
 
 /* Verify the mac */
-int PKCS12_verify_mac (PKCS12 *p12, unsigned char *pass, int passlen)
+int PKCS12_verify_mac (PKCS12 *p12, const char *pass, int passlen)
 {
 	unsigned char mac[EVP_MAX_MD_SIZE];
 	unsigned int maclen;
@@ -114,11 +114,12 @@ int PKCS12_verify_mac (PKCS12 *p12, unsigned char *pass, int passlen)
 
 /* Set a mac */
 
-int PKCS12_set_mac (PKCS12 *p12, unsigned char *pass, int passlen,
+int PKCS12_set_mac (PKCS12 *p12, const char *pass, int passlen,
 	     unsigned char *salt, int saltlen, int iter, EVP_MD *md_type)
 {
 	unsigned char mac[EVP_MAX_MD_SIZE];
-	int maclen;
+	unsigned int maclen;
+
 	if (!md_type) md_type = EVP_sha1();
 	if (PKCS12_setup_mac (p12, iter, salt, saltlen, md_type) ==
 				 	PKCS12_ERROR) {
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index 1300ef0dea..2f89e97890 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -62,7 +62,7 @@
 
 /* Cheap and nasty Unicode stuff */
 
-unsigned char *asc2uni (unsigned char *asc, unsigned char **uni, int *unilen)
+unsigned char *asc2uni (const char *asc, unsigned char **uni, int *unilen)
 {
 	int ulen, i;
 	unsigned char *unitmp;
diff --git a/crypto/pkcs12/pkcs12.h b/crypto/pkcs12/pkcs12.h
index 8f7a5b5ce6..9bf211ef44 100644
--- a/crypto/pkcs12/pkcs12.h
+++ b/crypto/pkcs12/pkcs12.h
@@ -192,28 +192,47 @@ ASN1_seq_unpack((p12)->authsafes->d.data->data, \
 #ifndef NOPROTO
 PKCS12_SAFEBAG *PKCS12_pack_safebag(char *obj, int (*i2d)(), int nid1, int nid2);
 PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
-X509_SIG *PKCS8_encrypt(int pbe_nid, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
+X509_SIG *PKCS8_encrypt(int pbe_nid, const char *pass, int passlen,
+			unsigned char *salt, int saltlen, int iter,
+			PKCS8_PRIV_KEY_INFO *p8);
+PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
+				     int passlen, unsigned char *salt,
+				     int saltlen, int iter,
+				     PKCS8_PRIV_KEY_INFO *p8);
 PKCS7 *PKCS12_pack_p7data(STACK *sk);
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, STACK *bags);
+PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
+			     unsigned char *salt, int saltlen, int iter,
+			     STACK *bags);
 int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen);
-int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen);
-int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, unsigned char *name, int namelen);
+int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
+				int namelen);
+int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag, const unsigned char *name,
+				int namelen);
 int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
 ASN1_TYPE *PKCS12_get_attr_gen(STACK *attrs, int attr_nid);
 char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
-unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, unsigned char *pass, int passlen, unsigned char *in, int inlen, unsigned char **data, int *datalen, int en_de);
-char *PKCS12_decrypt_d2i(X509_ALGOR *algor, char *(*d2i)(), void (*free_func)(), unsigned char *pass, int passlen, ASN1_STRING *oct, int seq);
-ASN1_STRING *PKCS12_i2d_encrypt(X509_ALGOR *algor, int (*i2d)(), unsigned char *pass, int passlen, char *obj, int seq);
+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);
+char *PKCS12_decrypt_d2i(X509_ALGOR *algor, char *(*d2i)(),
+			 void (*free_func)(), const char *pass, int passlen,
+			 ASN1_STRING *oct, int seq);
+ASN1_STRING *PKCS12_i2d_encrypt(X509_ALGOR *algor, int (*i2d)(),
+				const char *pass, int passlen, char *obj,
+				int seq);
 PKCS12 *PKCS12_init(int mode);
-int PKCS12_key_gen_asc(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);
+int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
+		       int saltlen, int id, int iter, int n,
+		       unsigned char *out, const EVP_MD *md_type);
 int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int id, int iter, int n, unsigned char *out, const EVP_MD *md_type);
-int PKCS12_PBE_keyivgen(unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md_type, unsigned char *key, unsigned char *iv);
-int PKCS12_gen_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *mac, unsigned int *maclen);
-int PKCS12_verify_mac(PKCS12 *p12, unsigned char *pass, int passlen);
-int PKCS12_set_mac(PKCS12 *p12, unsigned char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_MD *md_type);
+int PKCS12_PBE_keyivgen(const char *pass, int passlen, unsigned char *salt, int saltlen, int iter, EVP_CIPHER *cipher, EVP_MD *md_type, unsigned char *key, unsigned char *iv);
+int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *mac, unsigned int *maclen);
+int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
+int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
+		   unsigned char *salt, int saltlen, int iter,
+		   EVP_MD *md_type);
 int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen, EVP_MD *md_type);
-unsigned char *asc2uni(unsigned char *asc, unsigned char **uni, int *unilen);
+unsigned char *asc2uni(const char *asc, unsigned char **uni, int *unilen);
 char *uni2asc(unsigned char *uni, int unilen);
 int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **pp);
 PKCS12_BAGS *PKCS12_BAGS_new(void);
@@ -233,7 +252,8 @@ PKCS12_SAFEBAG *d2i_PKCS12_SAFEBAG(PKCS12_SAFEBAG **a, unsigned char **pp, long
 void PKCS12_SAFEBAG_free(PKCS12_SAFEBAG *a);
 void ERR_load_PKCS12_strings(void);
 void PKCS12_PBE_add(void);
-int PKCS12_parse(PKCS12 *p12, char *pass, EVP_PKEY **pkey, X509 **cert, STACK **ca);
+int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
+		 STACK **ca);
 PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, STACK *ca, int nid_key, int nid_cert, int iter, int mac_iter, int keytype);
 int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
 int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);