diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-12-16 22:12:24 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-12-16 22:14:49 +0100 |
| commit | 7644a9aef8932ed4d1c3f25ed776c997702982be (patch) | |
| tree | d8f1e7fca20ad12683a1e2e52c92b6999ada23a6 /crypto/evp | |
| parent | fix for no-ec (diff) | |
| download | openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.tar.xz openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.zip | |
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/evp')
| -rw-r--r-- | crypto/evp/e_chacha20_poly1305.c | 2 | ||||
| -rw-r--r-- | crypto/evp/evp_pbe.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/evp/e_chacha20_poly1305.c b/crypto/evp/e_chacha20_poly1305.c index 0d80f95e21..c3c72a1665 100644 --- a/crypto/evp/e_chacha20_poly1305.c +++ b/crypto/evp/e_chacha20_poly1305.c @@ -383,7 +383,7 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, case EVP_CTRL_COPY: if (actx) { if ((((EVP_CIPHER_CTX *)ptr)->cipher_data = - BUF_memdup(actx,sizeof(*actx) + Poly1305_ctx_size())) + OPENSSL_memdup(actx,sizeof(*actx) + Poly1305_ctx_size())) == NULL) { EVPerr(EVP_F_CHACHA20_POLY1305_CTRL, EVP_R_COPY_ERROR); return 0; diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index e5b1739486..563634ec53 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -141,7 +141,7 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, char obj_tmp[80]; EVPerr(EVP_F_EVP_PBE_CIPHERINIT, EVP_R_UNKNOWN_PBE_ALGORITHM); if (!pbe_obj) - BUF_strlcpy(obj_tmp, "NULL", sizeof obj_tmp); + OPENSSL_strlcpy(obj_tmp, "NULL", sizeof obj_tmp); else i2t_ASN1_OBJECT(obj_tmp, sizeof obj_tmp, pbe_obj); ERR_add_error_data(2, "TYPE=", obj_tmp); |