Ignore Makefile.save

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

diff --git a/crypto/pkcs12/p12_decr.c b/crypto/pkcs12/p12_decr.c
index d28e8860573fb293bee644923c0b4c6e0533c020..53fb8aad0fe7940bf2b920b4eff2b63cd7af4eba 100644 (file)
--- a/crypto/pkcs12/p12_decr.c
+++ b/crypto/pkcs12/p12_decr.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "pkcs12.h"
+#include <openssl/pkcs12.h>
 
 /* Define this to dump decrypted output to files called DERnnn */
 /*#define DEBUG_DECRYPT*/
@@ -68,16 +68,9 @@
  * Malloc'ed buffer
  */
 
-unsigned char * PKCS12_pbe_crypt (algor, pass, passlen, in, inlen,
-                                                data, datalen, en_de)
-X509_ALGOR *algor;
-unsigned char *pass;
-int passlen;
-unsigned char *in;
-int inlen;
-unsigned char **data;
-int *datalen;
-int en_de;
+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)
 {
        unsigned char *out;
        int outlen, i;
@@ -113,19 +106,16 @@ int en_de;
  * as a sequence.
  */
 
-char * PKCS12_decrypt_d2i (algor, d2i, free_func, pass, passlen, oct, seq)
-X509_ALGOR *algor;
-char * (*d2i)();
-void (*free_func)();
-unsigned char *pass;
-int passlen;
-ASN1_OCTET_STRING *oct;
-int seq;
+char * PKCS12_decrypt_d2i (X509_ALGOR *algor, char * (*d2i)(),
+            void (*free_func)(), const char *pass, 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)) {
+                              &out, &outlen, 0)) {
                PKCS12err(PKCS12_F_PKCS12_DECRYPT_D2I,PKCS12_R_PKCS12_PBE_CRYPT_ERROR);
                return NULL;
        }
@@ -156,13 +146,9 @@ int seq;
  * as a sequence
  */
 
-ASN1_OCTET_STRING *PKCS12_i2d_encrypt (algor, i2d, pass, passlen, obj, seq)
-X509_ALGOR *algor;
-int (*i2d)();
-unsigned char *pass;
-int passlen;
-char *obj;
-int seq;
+ASN1_OCTET_STRING *PKCS12_i2d_encrypt (X509_ALGOR *algor, int (*i2d)(),
+                                      const char *pass, int passlen,
+                                      char *obj, int seq)
 {
        ASN1_OCTET_STRING *oct;
        unsigned char *in, *p;