From 5687afdf032ac1d0e92958c209f6c493c347fa25 Mon Sep 17 00:00:00 2001 From: Pauli Date: Mon, 16 Nov 2020 12:08:30 +1000 Subject: [PATCH] rename sha1_ctrl to ossl_sha1_ctrl. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/13417) --- crypto/evp/legacy_sha.c | 7 ++++--- crypto/sha/sha1dgst.c | 2 +- include/crypto/sha.h | 2 +- providers/implementations/digests/sha2_prov.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/crypto/evp/legacy_sha.c b/crypto/evp/legacy_sha.c index 188f3e34e3..158591e9ab 100644 --- a/crypto/evp/legacy_sha.c +++ b/crypto/evp/legacy_sha.c @@ -60,12 +60,13 @@ IMPLEMENT_LEGACY_EVP_MD_METH(sha384, SHA384) IMPLEMENT_LEGACY_EVP_MD_METH(sha512, SHA512) IMPLEMENT_LEGACY_EVP_MD_METH(sha512_224_int, sha512_224) IMPLEMENT_LEGACY_EVP_MD_METH(sha512_256_int, sha512_256) -IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(sha3_int, sha3, '\x06') -IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(shake, sha3, '\x1f') +IMPLEMENT_LEGACY_EVP_MD_METH_SHA3(sha3_int, ossl_sha3, '\x06') +IMPLEMENT_LEGACY_EVP_MD_METH_SHAKE(shake, ossl_sha3, '\x1f') static int sha1_int_ctrl(EVP_MD_CTX *ctx, int cmd, int p1, void *p2) { - return sha1_ctrl(ctx != NULL ? EVP_MD_CTX_md_data(ctx) : NULL, cmd, p1, p2); + return ossl_sha1_ctrl(ctx != NULL ? EVP_MD_CTX_md_data(ctx) : NULL, + cmd, p1, p2); } static int shake_ctrl(EVP_MD_CTX *evp_ctx, int cmd, int p1, void *p2) diff --git a/crypto/sha/sha1dgst.c b/crypto/sha/sha1dgst.c index 1ece0db301..65d7e62e58 100644 --- a/crypto/sha/sha1dgst.c +++ b/crypto/sha/sha1dgst.c @@ -25,7 +25,7 @@ #include "sha_local.h" #include "crypto/sha.h" -int sha1_ctrl(SHA_CTX *sha1, int cmd, int mslen, void *ms) +int ossl_sha1_ctrl(SHA_CTX *sha1, int cmd, int mslen, void *ms) { unsigned char padtmp[40]; unsigned char sha1tmp[SHA_DIGEST_LENGTH]; diff --git a/include/crypto/sha.h b/include/crypto/sha.h index 57a3d20d0e..450c011f92 100644 --- a/include/crypto/sha.h +++ b/include/crypto/sha.h @@ -15,6 +15,6 @@ int sha512_224_init(SHA512_CTX *); int sha512_256_init(SHA512_CTX *); -int sha1_ctrl(SHA_CTX *ctx, int cmd, int mslen, void *ms); +int ossl_sha1_ctrl(SHA_CTX *ctx, int cmd, int mslen, void *ms); #endif diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c index dec9c316e7..2f01149ad9 100644 --- a/providers/implementations/digests/sha2_prov.c +++ b/providers/implementations/digests/sha2_prov.c @@ -45,8 +45,8 @@ static int sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[]) if (ctx != NULL && params != NULL) { p = OSSL_PARAM_locate_const(params, OSSL_DIGEST_PARAM_SSL3_MS); if (p != NULL && p->data_type == OSSL_PARAM_OCTET_STRING) - return sha1_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET, p->data_size, - p->data); + return ossl_sha1_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET, + p->data_size, p->data); } return 0; } -- 2.34.1