diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbe.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p5_pbe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c index a147ac3295..b7ed538eb2 100644 --- a/src/lib/libcrypto/asn1/p5_pbe.c +++ b/src/lib/libcrypto/asn1/p5_pbe.c | |||
@@ -103,7 +103,7 @@ void PBEPARAM_free (PBEPARAM *a) | |||
103 | if(a==NULL) return; | 103 | if(a==NULL) return; |
104 | M_ASN1_OCTET_STRING_free(a->salt); | 104 | M_ASN1_OCTET_STRING_free(a->salt); |
105 | M_ASN1_INTEGER_free (a->iter); | 105 | M_ASN1_INTEGER_free (a->iter); |
106 | Free (a); | 106 | OPENSSL_free (a); |
107 | } | 107 | } |
108 | 108 | ||
109 | /* Return an algorithm identifier for a PKCS#5 PBE algorithm */ | 109 | /* Return an algorithm identifier for a PKCS#5 PBE algorithm */ |
@@ -123,7 +123,7 @@ X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt, | |||
123 | if(iter <= 0) iter = PKCS5_DEFAULT_ITER; | 123 | if(iter <= 0) iter = PKCS5_DEFAULT_ITER; |
124 | ASN1_INTEGER_set (pbe->iter, iter); | 124 | ASN1_INTEGER_set (pbe->iter, iter); |
125 | if (!saltlen) saltlen = PKCS5_SALT_LEN; | 125 | if (!saltlen) saltlen = PKCS5_SALT_LEN; |
126 | if (!(pbe->salt->data = Malloc (saltlen))) { | 126 | if (!(pbe->salt->data = OPENSSL_malloc (saltlen))) { |
127 | ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); | 127 | ASN1err(ASN1_F_ASN1_PBE_SET,ERR_R_MALLOC_FAILURE); |
128 | return NULL; | 128 | return NULL; |
129 | } | 129 | } |