From 7644a9aef8932ed4d1c3f25ed776c997702982be Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Wed, 16 Dec 2015 16:12:24 -0500 Subject: Rename some BUF_xxx to OPENSSL_xxx Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen} to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen} Add #define's for the old names. Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros. Reviewed-by: Tim Hudson --- crypto/store/str_lib.c | 4 ++-- crypto/store/str_meth.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'crypto/store') diff --git a/crypto/store/str_lib.c b/crypto/store/str_lib.c index d5ecdbdbf4..301d0c0c6b 100644 --- a/crypto/store/str_lib.c +++ b/crypto/store/str_lib.c @@ -1305,7 +1305,7 @@ int STORE_ATTR_INFO_set_cstr(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, return 0; } if (!ATTR_IS_SET(attrs, code)) { - if ((attrs->values[code].cstring = BUF_strndup(cstr, cstr_size))) + if ((attrs->values[code].cstring = OPENSSL_strndup(cstr, cstr_size))) return 1; STOREerr(STORE_F_STORE_ATTR_INFO_SET_CSTR, ERR_R_MALLOC_FAILURE); return 0; @@ -1324,7 +1324,7 @@ int STORE_ATTR_INFO_set_sha1str(STORE_ATTR_INFO *attrs, STORE_ATTR_TYPES code, } if (!ATTR_IS_SET(attrs, code)) { if ((attrs->values[code].sha1string = - (unsigned char *)BUF_memdup(sha1str, sha1str_size))) + (unsigned char *)OPENSSL_memdup(sha1str, sha1str_size))) return 1; STOREerr(STORE_F_STORE_ATTR_INFO_SET_SHA1STR, ERR_R_MALLOC_FAILURE); return 0; diff --git a/crypto/store/str_meth.c b/crypto/store/str_meth.c index f9ce8bb4e7..5e0f4bd276 100644 --- a/crypto/store/str_meth.c +++ b/crypto/store/str_meth.c @@ -66,7 +66,7 @@ STORE_METHOD *STORE_create_method(char *name) STORE_METHOD *store_method = OPENSSL_zalloc(sizeof(*store_method)); if (store_method != NULL) - store_method->name = BUF_strdup(name); + store_method->name = OPENSSL_strdup(name); return store_method; } -- cgit v1.2.3