diff options
author | Rich Salz <rsalz@akamai.com> | 2015-12-16 16:51:12 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-12-22 07:32:51 -0500 |
commit | c99de0533debc8a6ed08b47b414bdea19457eafd (patch) | |
tree | e91742edbd97c2c04c3dedfa00777eac6ca8f107 /crypto | |
parent | f5d97098a4c5d1c91887a3f2e0a31c1e20ca32e3 (diff) |
Rename *_realloc_clean to *_clear_realloc
Just like *_clear_free routines. Previously undocumented, used
a half-dozen times within OpenSSL source.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/a_bitstr.c | 2 | ||||
-rw-r--r-- | crypto/asn1/f_int.c | 2 | ||||
-rw-r--r-- | crypto/buffer/buffer.c | 2 | ||||
-rw-r--r-- | crypto/mem.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/crypto/asn1/a_bitstr.c b/crypto/asn1/a_bitstr.c index 5f7ae6a373..b4e71fd0f7 100644 --- a/crypto/asn1/a_bitstr.c +++ b/crypto/asn1/a_bitstr.c @@ -204,7 +204,7 @@ int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value) if ((a->length < (w + 1)) || (a->data == NULL)) { if (!value) return (1); /* Don't need to set */ - c = OPENSSL_realloc_clean(a->data, a->length, w + 1); + c = OPENSSL_clear_realloc(a->data, a->length, w + 1); if (c == NULL) { ASN1err(ASN1_F_ASN1_BIT_STRING_SET_BIT, ERR_R_MALLOC_FAILURE); return 0; diff --git a/crypto/asn1/f_int.c b/crypto/asn1/f_int.c index 9a0928ecbc..1c02cc0a62 100644 --- a/crypto/asn1/f_int.c +++ b/crypto/asn1/f_int.c @@ -164,7 +164,7 @@ int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size) } i /= 2; if (num + i > slen) { - sp = OPENSSL_realloc_clean(s, slen, num + i * 2); + sp = OPENSSL_clear_realloc(s, slen, num + i * 2); if (sp == NULL) { ASN1err(ASN1_F_A2I_ASN1_INTEGER, ERR_R_MALLOC_FAILURE); OPENSSL_free(s); diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c index 705037b06d..0b15c6be6b 100644 --- a/crypto/buffer/buffer.c +++ b/crypto/buffer/buffer.c @@ -179,7 +179,7 @@ size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len) if ((str->flags & BUF_MEM_FLAG_SECURE)) ret = sec_alloc_realloc(str, n); else - ret = OPENSSL_realloc_clean(str->data, str->max, n); + ret = OPENSSL_clear_realloc(str->data, str->max, n); if (ret == NULL) { BUFerr(BUF_F_BUF_MEM_GROW_CLEAN, ERR_R_MALLOC_FAILURE); len = 0; diff --git a/crypto/mem.c b/crypto/mem.c index 7ecf0aebeb..939ad69775 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -337,7 +337,7 @@ void *CRYPTO_realloc(void *str, size_t num, const char *file, int line) return ret; } -void *CRYPTO_realloc_clean(void *str, size_t old_len, size_t num, +void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num, const char *file, int line) { void *ret = NULL; |