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 a94d6c14d8d8d54728aa5834ac4862d945257b83..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.
  */
 /* ====================================================================
@@ -58,59 +58,91 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
+#include <openssl/asn1t.h>
+#include <openssl/x509.h>
+#include <openssl/rand.h>
 
 /* PKCS#5 password based encryption structure */
 
-/*
- *ASN1err(ASN1_F_PBEPARAM_NEW,ASN1_R_DEOCDE_ERROR)
- *ASN1err(ASN1_F_D2I_PBEPARAM,ASN1_R_DEOCDE_ERROR)
- */
+ASN1_SEQUENCE(PBEPARAM) = {
+       ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
+       ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
+} ASN1_SEQUENCE_END(PBEPARAM)
+
+IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
+
+
+/* Set an algorithm identifier for a PKCS#5 PBE algorithm */
+
+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;
+
+       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;
+
+       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;
+       }
+
+/* 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;
+               }
+
+       if (PKCS5_pbe_set0_algor(ret, alg, iter, salt, saltlen)) 
+               return ret;
 
-int i2d_PBEPARAM(a, pp)
-PBEPARAM *a;
-unsigned char **pp;
-{
-       M_ASN1_I2D_vars(a);
-       M_ASN1_I2D_len (a->salt, i2d_ASN1_OCTET_STRING);
-       M_ASN1_I2D_len (a->iter, i2d_ASN1_INTEGER);
-
-       M_ASN1_I2D_seq_total ();
-
-       M_ASN1_I2D_put (a->salt, i2d_ASN1_OCTET_STRING);
-       M_ASN1_I2D_put (a->iter, i2d_ASN1_INTEGER);
-       M_ASN1_I2D_finish();
-}
-
-PBEPARAM *PBEPARAM_new()
-{
-       PBEPARAM *ret=NULL;
-       ASN1_CTX c;
-       M_ASN1_New_Malloc(ret, PBEPARAM);
-       M_ASN1_New(ret->iter,ASN1_INTEGER_new);
-       M_ASN1_New(ret->salt,ASN1_OCTET_STRING_new);
-       return (ret);
-       M_ASN1_New_Error(ASN1_F_PBEPARAM_NEW);
-}
-
-PBEPARAM *d2i_PBEPARAM(a,pp,length)
-PBEPARAM **a;
-unsigned char **pp;
-long length;
-{
-       M_ASN1_D2I_vars(a,PBEPARAM *,PBEPARAM_new);
-       M_ASN1_D2I_Init();
-       M_ASN1_D2I_start_sequence();
-       M_ASN1_D2I_get (ret->salt, d2i_ASN1_OCTET_STRING);
-       M_ASN1_D2I_get (ret->iter, d2i_ASN1_INTEGER);
-       M_ASN1_D2I_Finish(a, PBEPARAM_free, ASN1_F_D2I_PBEPARAM);
-}
-
-void PBEPARAM_free (a)
-PBEPARAM *a;
-{
-       if(a==NULL) return;
-       ASN1_OCTET_STRING_free(a->salt);
-       ASN1_INTEGER_free (a->iter);
-       Free ((char *)a);
-}
+       X509_ALGOR_free(ret);
+       return NULL;
+       }