Merge from 1.0.0-stable branch.

[openssl.git] / crypto / asn1 / p5_pbe.c

diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index eedeb9ee3e82a313980639f67000bf715eef4d45..94bc38b99f93178f90d2fc88037cb57194dc8d45 100644 (file)
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -1,5 +1,5 @@
 /* p5_pbe.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
 /* ====================================================================
@@ -67,56 +67,82 @@
 ASN1_SEQUENCE(PBEPARAM) = {
        ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
        ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
-} ASN1_SEQUENCE_END(PBEPARAM);
+} ASN1_SEQUENCE_END(PBEPARAM)
 
 IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
 
-/* Return an algorithm identifier for a PKCS#5 PBE algorithm */
 
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
-            int saltlen)
-{
-       PBEPARAM *pbe;
-       ASN1_OBJECT *al;
-       X509_ALGOR *algor;
-       ASN1_TYPE *astype;
+/* Set an algorithm identifier for a PKCS#5 PBE algorithm */
 
-       if (!(pbe = PBEPARAM_new ())) {
-               ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-               return NULL;
-       }
-       if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
-       ASN1_INTEGER_set (pbe->iter, iter);
-       if (!saltlen) saltlen = PKCS5_SALT_LEN;
-       if (!(pbe->salt->data = OPENSSL_malloc (saltlen))) {
-               ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-               return NULL;
-       }
-       pbe->salt->length = saltlen;
-       if (salt) memcpy (pbe->salt->data, salt, saltlen);
-       else if (RAND_pseudo_bytes (pbe->salt->data, saltlen) < 0)
-               return NULL;
+int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
+                               const unsigned char *salt, int saltlen)
+       {
+       PBEPARAM *pbe=NULL;
+       ASN1_STRING *pbe_str=NULL;
+       unsigned char *sstr;
 
-       if (!(astype = ASN1_TYPE_new())) {
-               ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-               return NULL;
-       }
+       pbe = PBEPARAM_new();
+       if (!pbe)
+               {
+               ASN1err(ASN1_F_PKCS5_PBE_SET0_ALGOR,ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+       if(iter <= 0)
+               iter = PKCS5_DEFAULT_ITER;
+       if (!ASN1_INTEGER_set(pbe->iter, iter))
+               {
+               ASN1err(ASN1_F_PKCS5_PBE_SET0_ALGOR,ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+       if (!saltlen)
+               saltlen = PKCS5_SALT_LEN;
+       if (!ASN1_STRING_set(pbe->salt, NULL, saltlen))
+               {
+               ASN1err(ASN1_F_PKCS5_PBE_SET0_ALGOR,ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+       sstr = ASN1_STRING_data(pbe->salt);
+       if (salt)
+               memcpy(sstr, salt, saltlen);
+       else if (RAND_pseudo_bytes(sstr, saltlen) < 0)
+               goto err;
 
-       astype->type = V_ASN1_SEQUENCE;
-       if(!ASN1_pack_string(pbe, i2d_PBEPARAM, &astype->value.sequence)) {
-               ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
-               return NULL;
+       if(!ASN1_item_pack(pbe, ASN1_ITEM_rptr(PBEPARAM), &pbe_str))
+               {
+               ASN1err(ASN1_F_PKCS5_PBE_SET0_ALGOR,ERR_R_MALLOC_FAILURE);
+               goto err;
+               }
+
+       PBEPARAM_free(pbe);
+       pbe = NULL;
+
+       if (X509_ALGOR_set0(algor, OBJ_nid2obj(alg), V_ASN1_SEQUENCE, pbe_str))
+               return 1;
+
+err:
+       if (pbe != NULL)
+               PBEPARAM_free(pbe);
+       if (pbe_str != NULL)
+               ASN1_STRING_free(pbe_str);
+       return 0;
        }
-       PBEPARAM_free (pbe);
-       
-       al = OBJ_nid2obj(alg); /* never need to free al */
-       if (!(algor = X509_ALGOR_new())) {
-               ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
+
+/* Return an algorithm identifier for a PKCS#5 PBE algorithm */
+
+X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
+                               const unsigned char *salt, int saltlen)
+       {
+       X509_ALGOR *ret;
+       ret = X509_ALGOR_new();
+       if (!ret)
+               {
+               ASN1err(ASN1_F_PKCS5_PBE_SET,ERR_R_MALLOC_FAILURE);
                return NULL;
-       }
-       ASN1_OBJECT_free(algor->algorithm);
-       algor->algorithm = al;
-       algor->parameter = astype;
+               }
 
-       return (algor);
-}
+       if (PKCS5_pbe_set0_algor(ret, alg, iter, salt, saltlen)) 
+               return ret;
+
+       X509_ALGOR_free(ret);
+       return NULL;
+       }