diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-06-01 22:19:21 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-06-01 22:19:21 +0000 |
| commit | 26a3a48d65c7464b400ec1de439994d7f0d25fed (patch) | |
| tree | 91abb7d351b174e58f60e5353b731b916eaf0c5c /crypto/asn1/p5_pbev2.c | |
| parent | de42b6a7a82be33d2976ab605e74d7bc95b71447 (diff) | |
| download | openssl-26a3a48d65c7464b400ec1de439994d7f0d25fed.tar.gz | |
There have been a number of complaints from a number of sources that names
like Malloc, Realloc and especially Free conflict with already existing names
on some operating systems or other packages. That is reason enough to change
the names of the OpenSSL memory allocation macros to something that has a
better chance of being unique, like prepending them with OPENSSL_.
This change includes all the name changes needed throughout all C files.
Diffstat (limited to 'crypto/asn1/p5_pbev2.c')
| -rw-r--r-- | crypto/asn1/p5_pbev2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/p5_pbev2.c b/crypto/asn1/p5_pbev2.c index 1bbdb10c71..6a7b578c0e 100644 --- a/crypto/asn1/p5_pbev2.c +++ b/crypto/asn1/p5_pbev2.c @@ -104,7 +104,7 @@ void PBE2PARAM_free (PBE2PARAM *a) if(a==NULL) return; X509_ALGOR_free(a->keyfunc); X509_ALGOR_free(a->encryption); - Free (a); + OPENSSL_free (a); } int i2d_PBKDF2PARAM(PBKDF2PARAM *a, unsigned char **pp) @@ -158,7 +158,7 @@ void PBKDF2PARAM_free (PBKDF2PARAM *a) M_ASN1_INTEGER_free(a->iter); M_ASN1_INTEGER_free(a->keylength); X509_ALGOR_free(a->prf); - Free (a); + OPENSSL_free (a); } /* 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, if(!(osalt = M_ASN1_OCTET_STRING_new())) goto merr; if (!saltlen) saltlen = PKCS5_SALT_LEN; - if (!(osalt->data = Malloc (saltlen))) goto merr; + if (!(osalt->data = OPENSSL_malloc (saltlen))) goto merr; osalt->length = saltlen; if (salt) memcpy (osalt->data, salt, saltlen); else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr; |