Reformat/tidy some of the ASN1 code.

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

diff --git a/crypto/asn1/p5_pbe.c b/crypto/asn1/p5_pbe.c
index a94d6c14d8d8d54728aa5834ac4862d945257b83..891150638e997b741e307d7fc15430ea706e8f46 100644 (file)
--- a/crypto/asn1/p5_pbe.c
+++ b/crypto/asn1/p5_pbe.c
@@ -58,59 +58,65 @@
 
 #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)
 
-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);
+IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
 
-       M_ASN1_I2D_seq_total ();
+/* Return an algorithm identifier for a PKCS#5 PBE algorithm */
 
-       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()
+X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
+            int saltlen)
 {
-       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 *pbe;
+       ASN1_OBJECT *al;
+       X509_ALGOR *algor;
+       ASN1_TYPE *astype;
 
-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);
-}
+       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;
 
-void PBEPARAM_free (a)
-PBEPARAM *a;
-{
-       if(a==NULL) return;
-       ASN1_OCTET_STRING_free(a->salt);
-       ASN1_INTEGER_free (a->iter);
-       Free ((char *)a);
+       if (!(astype = ASN1_TYPE_new())) {
+               ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);
+               return NULL;
+       }
+
+       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;
+       }
+       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 NULL;
+       }
+       ASN1_OBJECT_free(algor->algorithm);
+       algor->algorithm = al;
+       algor->parameter = astype;
+
+       return (algor);
 }