diff options
| author | Pauli <paul.dale@oracle.com> | 2020-11-16 11:52:39 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-11-19 07:38:53 +1000 |
| commit | 627b73cc72d0c42a01c464b8b567ea0f7d907e05 (patch) | |
| tree | d3bb5ce6b30706259e193ab92bdb4703f71b46cb /providers | |
| parent | 3800cc6f4d285699210da496a42434bd2b42e065 (diff) | |
Rename md5_sha1_* ossl_md5_sha1_*
md5_sha1_init(), md5_sha1_update(), md5_sha1_final() and md5_sha1_ctrl().
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13417)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/implementations/digests/md5_sha1_prov.c | 6 | ||||
| -rw-r--r-- | providers/implementations/include/prov/md5_sha1.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/providers/implementations/digests/md5_sha1_prov.c b/providers/implementations/digests/md5_sha1_prov.c index 7c127d74a6..d96b72676b 100644 --- a/providers/implementations/digests/md5_sha1_prov.c +++ b/providers/implementations/digests/md5_sha1_prov.c @@ -44,8 +44,8 @@ static int md5_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 md5_sha1_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET, p->data_size, - p->data); + return ossl_md5_sha1_ctrl(ctx, EVP_CTRL_SSL3_MASTER_SECRET, + p->data_size, p->data); } return 0; } @@ -53,5 +53,5 @@ static int md5_sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[]) /* ossl_md5_sha1_functions */ IMPLEMENT_digest_functions_with_settable_ctx( md5_sha1, MD5_SHA1_CTX, MD5_SHA1_CBLOCK, MD5_SHA1_DIGEST_LENGTH, 0, - md5_sha1_init, md5_sha1_update, md5_sha1_final, + ossl_md5_sha1_init, ossl_md5_sha1_update, ossl_md5_sha1_final, md5_sha1_settable_ctx_params, md5_sha1_set_ctx_params) diff --git a/providers/implementations/include/prov/md5_sha1.h b/providers/implementations/include/prov/md5_sha1.h index 3e80fdcf97..9b9dc3d5ef 100644 --- a/providers/implementations/include/prov/md5_sha1.h +++ b/providers/implementations/include/prov/md5_sha1.h @@ -27,10 +27,10 @@ typedef struct md5_sha1_st { SHA_CTX sha1; } MD5_SHA1_CTX; -int md5_sha1_init(MD5_SHA1_CTX *mctx); -int md5_sha1_update(MD5_SHA1_CTX *mctx, const void *data, size_t count); -int md5_sha1_final(unsigned char *md, MD5_SHA1_CTX *mctx); -int md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms); +int ossl_md5_sha1_init(MD5_SHA1_CTX *mctx); +int ossl_md5_sha1_update(MD5_SHA1_CTX *mctx, const void *data, size_t count); +int ossl_md5_sha1_final(unsigned char *md, MD5_SHA1_CTX *mctx); +int ossl_md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms); # endif /* OPENSSL_NO_MD5 */ |