diff options
Diffstat (limited to 'src/lib/libcrypto/asn1/p5_pbev2.c')
-rw-r--r-- | src/lib/libcrypto/asn1/p5_pbev2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c index 1bbdb10c71..6a7b578c0e 100644 --- a/src/lib/libcrypto/asn1/p5_pbev2.c +++ b/src/lib/libcrypto/asn1/p5_pbev2.c | |||
@@ -104,7 +104,7 @@ void PBE2PARAM_free (PBE2PARAM *a) | |||
104 | if(a==NULL) return; | 104 | if(a==NULL) return; |
105 | X509_ALGOR_free(a->keyfunc); | 105 | X509_ALGOR_free(a->keyfunc); |
106 | X509_ALGOR_free(a->encryption); | 106 | X509_ALGOR_free(a->encryption); |
107 | Free (a); | 107 | OPENSSL_free (a); |
108 | } | 108 | } |
109 | 109 | ||
110 | int i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **pp) | 110 | int i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **pp) |
@@ -158,7 +158,7 @@ void PBKDF2PARAM_free (PBKDF2PARAM *a) | |||
158 | M_ASN1_INTEGER_free(a->iter); | 158 | M_ASN1_INTEGER_free(a->iter); |
159 | M_ASN1_INTEGER_free(a->keylength); | 159 | M_ASN1_INTEGER_free(a->keylength); |
160 | X509_ALGOR_free(a->prf); | 160 | X509_ALGOR_free(a->prf); |
161 | Free (a); | 161 | OPENSSL_free (a); |
162 | } | 162 | } |
163 | 163 | ||
164 | /* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm: | 164 | /* Return an algorithm identifier for a PKCS#5 v2.0 PBE algorithm: |
@@ -210,7 +210,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter, | |||
210 | if(!(osalt = M_ASN1_OCTET_STRING_new())) goto merr; | 210 | if(!(osalt = M_ASN1_OCTET_STRING_new())) goto merr; |
211 | 211 | ||
212 | if (!saltlen) saltlen = PKCS5_SALT_LEN; | 212 | if (!saltlen) saltlen = PKCS5_SALT_LEN; |
213 | if (!(osalt->data = Malloc (saltlen))) goto merr; | 213 | if (!(osalt->data = OPENSSL_malloc (saltlen))) goto merr; |
214 | osalt->length = saltlen; | 214 | osalt->length = saltlen; |
215 | if (salt) memcpy (osalt->data, salt, saltlen); | 215 | if (salt) memcpy (osalt->data, salt, saltlen); |
216 | else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr; | 216 | else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr; |