diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-12-16 16:12:24 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-12-16 16:14:49 -0500 |
| commit | 7644a9aef8932ed4d1c3f25ed776c997702982be (patch) | |
| tree | d8f1e7fca20ad12683a1e2e52c92b6999ada23a6 /crypto/conf | |
| parent | e4cf866322a4549c55153f9f135f9dadf4d3fc31 (diff) | |
| download | openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.tar.gz | |
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 <tjh@openssl.org>
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_def.c | 4 | ||||
| -rw-r--r-- | crypto/conf/conf_mod.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 1ff49aa281..ac074056d1 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -223,7 +223,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) goto err; } - section = BUF_strdup("default"); + section = OPENSSL_strdup("default"); if (section == NULL) { CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE); goto err; @@ -366,7 +366,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) CONFerr(CONF_F_DEF_LOAD_BIO, ERR_R_MALLOC_FAILURE); goto err; } - BUF_strlcpy(v->name, pname, strlen(pname) + 1); + OPENSSL_strlcpy(v->name, pname, strlen(pname) + 1); if (!str_copy(conf, psection, &(v->value), start)) goto err; diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c index c1fbb601d5..4fafdeddd3 100644 --- a/crypto/conf/conf_mod.c +++ b/crypto/conf/conf_mod.c @@ -286,7 +286,7 @@ static CONF_MODULE *module_add(DSO *dso, const char *name, return NULL; tmod->dso = dso; - tmod->name = BUF_strdup(name); + tmod->name = OPENSSL_strdup(name); tmod->init = ifunc; tmod->finish = ffunc; @@ -340,8 +340,8 @@ static int module_init(CONF_MODULE *pmod, char *name, char *value, goto err; imod->pmod = pmod; - imod->name = BUF_strdup(name); - imod->value = BUF_strdup(value); + imod->name = OPENSSL_strdup(name); + imod->value = OPENSSL_strdup(value); imod->usr_data = NULL; if (!imod->name || !imod->value) @@ -525,7 +525,7 @@ char *CONF_get1_default_config_file(void) file = getenv("OPENSSL_CONF"); if (file) - return BUF_strdup(file); + return OPENSSL_strdup(file); len = strlen(X509_get_default_cert_area()); #ifndef OPENSSL_SYS_VMS @@ -537,11 +537,11 @@ char *CONF_get1_default_config_file(void) if (file == NULL) return NULL; - BUF_strlcpy(file, X509_get_default_cert_area(), len + 1); + OPENSSL_strlcpy(file, X509_get_default_cert_area(), len + 1); #ifndef OPENSSL_SYS_VMS - BUF_strlcat(file, "/", len + 1); + OPENSSL_strlcat(file, "/", len + 1); #endif - BUF_strlcat(file, OPENSSL_CONF, len + 1); + OPENSSL_strlcat(file, OPENSSL_CONF, len + 1); return file; } |