-/* p12_pbop.c */
+/* evp_pbe.c */
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
* project 1999.
*/
*/
#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 */
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;
unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
int i;
pbelu.pbe_nid = OBJ_obj2nid(pbe_obj);
- if ((pbelu.pbe_nid != NID_undef) && pbe_algs)
- i = sk_find (pbe_algs, (char *)&pbelu);
+ if (pbelu.pbe_nid != NID_undef) i = sk_find(pbe_algs, (char *)&pbelu);
else i = -1;
if (i == -1) {
/* 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);
}
-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);
return 1;
}
-void EVP_PBE_cleanup()
+void EVP_PBE_cleanup(void)
{
sk_pop_free(pbe_algs, FreeFunc);
+ pbe_algs = NULL;
}