/* PKCS#5 password based encryption structure */
-#define PKCS5_SALT_LEN 8
-
int i2d_PBEPARAM(PBEPARAM *a, unsigned char **pp)
{
M_ASN1_I2D_vars(a);
X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
int saltlen)
{
- unsigned char *pdata, *ptmp;
- int plen;
PBEPARAM *pbe;
ASN1_OBJECT *al;
X509_ALGOR *algor;
pbe->salt->length = saltlen;
if (salt) memcpy (pbe->salt->data, salt, saltlen);
else RAND_bytes (pbe->salt->data, saltlen);
- if (!(plen = i2d_PBEPARAM (pbe, NULL))) {
- ASN1err(ASN1_F_ASN1_PBE_SET,ASN1_R_ENCODE_ERROR);
- return NULL;
- }
- if (!(pdata = Malloc (plen))) {
- ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
- return NULL;
- }
- ptmp = pdata;
- i2d_PBEPARAM (pbe, &ptmp);
- PBEPARAM_free (pbe);
if (!(astype = ASN1_TYPE_new())) {
ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
}
astype->type = V_ASN1_SEQUENCE;
- if (!(astype->value.sequence=ASN1_STRING_new())) {
+ if(!ASN1_pack_string(pbe, i2d_PBEPARAM, &astype->value.sequence)) {
ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
return NULL;
}
- ASN1_STRING_set (astype->value.sequence, pdata, plen);
- Free (pdata);
+ PBEPARAM_free (pbe);
al = OBJ_nid2obj(alg); /* never need to free al */
if (!(algor = X509_ALGOR_new())) {