Ignore Makefile.save

[openssl.git] / crypto / pkcs12 / p12_key.c

diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c
index eb774e45f0acb64e4821302237f148e2b2e91b50..ff41f12aa0e09e42a42cedf40c3fc24e9c1ac4fa 100644 (file)
--- a/crypto/pkcs12/p12_key.c
+++ b/crypto/pkcs12/p12_key.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "pkcs12.h"
+#include <openssl/pkcs12.h>
 
 
 /* Uncomment out this line to get debugging info about key generation */
@@ -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)
 {