1 files changed, 9 insertions, 43 deletions

diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c
index b831836e7b..891150638e 100644
--- a/src/lib/libcrypto/asn1/p5_pbe.c
+++ b/src/lib/libcrypto/asn1/p5_pbe.c
@@ -58,53 +58,18 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include <openssl/asn1_mac.h>
+#include <openssl/asn1t.h>
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 
 /* PKCS#5 password based encryption structure */
 
-int i2d_PBEPARAM(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 ();
+ASN1_SEQUENCE(PBEPARAM) = {
+        ASN1_SIMPLE(PBEPARAM, salt, ASN1_OCTET_STRING),
+        ASN1_SIMPLE(PBEPARAM, iter, ASN1_INTEGER)
+} ASN1_SEQUENCE_END(PBEPARAM)
 
-        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(void)
-{
-        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(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 (PBEPARAM *a)
-{
-        if(a==NULL) return;
-        ASN1_OCTET_STRING_free(a->salt);
-        ASN1_INTEGER_free (a->iter);
-        Free ((char *)a);
-}
+IMPLEMENT_ASN1_FUNCTIONS(PBEPARAM)
 
 /* Return an algorithm identifier for a PKCS#5 PBE algorithm */
 
@@ -123,13 +88,14 @@ X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
         if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
         ASN1_INTEGER_set (pbe->iter, iter);
         if (!saltlen) saltlen = PKCS5_SALT_LEN;
-        if (!(pbe->salt->data = Malloc (saltlen))) {
+        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 RAND_bytes (pbe->salt->data, saltlen);
+        else if (RAND_pseudo_bytes (pbe->salt->data, saltlen) < 0)
+                return NULL;
 
         if (!(astype = ASN1_TYPE_new())) {
                 ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE);