"make depend"

[oweals/openssl.git] / crypto / evp / evp_pbe.c

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index e1ebb66357bd7f09f5ab0490984acf214a36534e..02ae151cf47c5a86c5619a5e5c40c703116a8c39 100644 (file)
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -1,4 +1,4 @@
-/* p12_pbop.c */
+/* evp_pbe.c */
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
  * project 1999.
  */
@@ -57,8 +57,8 @@
  */
 
 #include <stdio.h>
-#include "evp.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/x509.h>
 #include "cryptlib.h"
 
 /* Password based encryption (PBE) functions */
@@ -74,12 +74,9 @@ EVP_MD *md;
 EVP_PBE_KEYGEN *keygen;
 } EVP_PBE_CTL;
 
-int EVP_PBE_CipherInit (pbe_obj, pass, passlen, salt, saltlen, iter, ctx, en_de)
-ASN1_OBJECT *pbe_obj;
-int passlen, saltlen, iter;
-unsigned char *pass, *salt;
-EVP_CIPHER_CTX *ctx;
-int en_de;
+int EVP_PBE_CipherInit (ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
+            unsigned char *salt, int saltlen, int iter, EVP_CIPHER_CTX *ctx,
+            int en_de)
 {
 
        EVP_PBE_CTL *pbetmp, pbelu;
@@ -112,19 +109,15 @@ int en_de;
 
 /* Setup a PBE algorithm but take most parameters from AlgorithmIdentifier */
 
-int EVP_PBE_ALGOR_CipherInit (algor, pass, passlen, ctx, en_de)
-X509_ALGOR *algor;
-unsigned char *pass;
-int passlen;
-EVP_CIPHER_CTX *ctx;
-int en_de;
+int EVP_PBE_ALGOR_CipherInit (X509_ALGOR *algor, const char *pass,
+                             int passlen, EVP_CIPHER_CTX *ctx, int en_de)
 {
        PBEPARAM *pbe;
        int saltlen, iter;
        unsigned char *salt, *pbuf;
 
        /* Extract useful info from algor */
-       pbuf = (char *) algor->parameter->value.sequence->data;
+       pbuf = algor->parameter->value.sequence->data;
        if (!(pbe = d2i_PBEPARAM (NULL, &pbuf,
                         algor->parameter->value.sequence->length))) {
                EVPerr(EVP_F_EVP_PBE_ALGOR_CIPHERINIT,EVP_R_DECODE_ERROR);
@@ -147,19 +140,15 @@ int en_de;
 }
 
 
-static int pbe_cmp (pbe1, pbe2)
-EVP_PBE_CTL **pbe1, **pbe2;
+static int pbe_cmp (EVP_PBE_CTL **pbe1, EVP_PBE_CTL **pbe2)
 {
        return ((*pbe1)->pbe_nid - (*pbe2)->pbe_nid);
 }
 
 /* Add a PBE algorithm */
 
-int EVP_PBE_alg_add (nid, cipher, md, keygen)
-int nid;
-EVP_CIPHER *cipher;
-EVP_MD *md;
-EVP_PBE_KEYGEN *keygen;
+int EVP_PBE_alg_add (int nid, EVP_CIPHER *cipher, EVP_MD *md,
+            EVP_PBE_KEYGEN *keygen)
 {
        EVP_PBE_CTL *pbe_tmp;
        if (!pbe_algs) pbe_algs = sk_new (pbe_cmp);
@@ -174,3 +163,8 @@ EVP_PBE_KEYGEN *keygen;
        sk_push (pbe_algs, (char *)pbe_tmp);
        return 1;
 }
+
+void EVP_PBE_cleanup(void)
+{
+       sk_pop_free(pbe_algs, FreeFunc);
+}