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 /engines | |
| parent | e4cf866322a4549c55153f9f135f9dadf4d3fc31 (diff) | |
| download | openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.zip openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.tar.gz openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.tar.bz2 | |
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 'engines')
| -rw-r--r-- | engines/ccgost/gost_ctl.c | 4 | ||||
| -rw-r--r-- | engines/e_capi.c | 6 | ||||
| -rw-r--r-- | engines/e_chil.c | 2 | ||||
| -rw-r--r-- | engines/e_ubsec.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/ccgost/gost_ctl.c b/engines/ccgost/gost_ctl.c index 31b95a0..20a07df 100644 --- a/engines/ccgost/gost_ctl.c +++ b/engines/ccgost/gost_ctl.c @@ -67,7 +67,7 @@ const char *get_gost_engine_param(int param) tmp = getenv(gost_envnames[param]); if (tmp) { OPENSSL_free(gost_params[param]); - gost_params[param] = BUF_strdup(tmp); + gost_params[param] = OPENSSL_strdup(tmp); return gost_params[param]; } return NULL; @@ -85,7 +85,7 @@ int gost_set_default_param(int param, const char *value) if (!tmp) tmp = value; OPENSSL_free(gost_params[param]); - gost_params[param] = BUF_strdup(tmp); + gost_params[param] = OPENSSL_strdup(tmp); return 1; } diff --git a/engines/e_capi.c b/engines/e_capi.c index 1e41b26..8ef986f 100644 --- a/engines/e_capi.c +++ b/engines/e_capi.c @@ -361,7 +361,7 @@ static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void)) case CAPI_CMD_STORE_NAME: OPENSSL_free(ctx->storename); - ctx->storename = BUF_strdup(p); + ctx->storename = OPENSSL_strdup(p); CAPI_trace(ctx, "Setting store name to %s\n", p); break; @@ -382,7 +382,7 @@ static int capi_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void)) break; case CAPI_CMD_DEBUG_FILE: - ctx->debug_file = BUF_strdup(p); + ctx->debug_file = OPENSSL_strdup(p); CAPI_trace(ctx, "Setting debug file to %s\n", ctx->debug_file); break; @@ -1635,7 +1635,7 @@ static int capi_ctx_set_provname(CAPI_CTX * ctx, LPSTR pname, DWORD type, CryptReleaseContext(hprov, 0); } OPENSSL_free(ctx->cspname); - ctx->cspname = BUF_strdup(pname); + ctx->cspname = OPENSSL_strdup(pname); ctx->csptype = type; return 1; } diff --git a/engines/e_chil.c b/engines/e_chil.c index 8696c9a..924de8c 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -476,7 +476,7 @@ static const char *get_HWCRHK_LIBNAME(void) static long set_HWCRHK_LIBNAME(const char *name) { free_HWCRHK_LIBNAME(); - return (((HWCRHK_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); + return (((HWCRHK_LIBNAME = OPENSSL_strdup(name)) != NULL) ? 1 : 0); } static const char *n_hwcrhk_Init = "HWCryptoHook_Init"; diff --git a/engines/e_ubsec.c b/engines/e_ubsec.c index eefd37f..f59dfa6 100644 --- a/engines/e_ubsec.c +++ b/engines/e_ubsec.c @@ -346,7 +346,7 @@ static void free_UBSEC_LIBNAME(void) static long set_UBSEC_LIBNAME(const char *name) { free_UBSEC_LIBNAME(); - return (((UBSEC_LIBNAME = BUF_strdup(name)) != NULL) ? 1 : 0); + return (((UBSEC_LIBNAME = OPENSSL_strdup(name)) != NULL) ? 1 : 0); } static const char *UBSEC_F1 = "ubsec_bytes_to_bits"; |