Get rid of the diversity of names for MAC parameters

[openssl.git] / providers / default / digests / md5_sha1_prov.c

diff --git a/providers/default/digests/md5_sha1_prov.c b/providers/default/digests/md5_sha1_prov.c
index 34cc60206b51617aa2647fe489f5144a73eee13a..7f224cba4fd8dd1e593f9e3c91039ed78cf8c708 100644 (file)
--- a/providers/default/digests/md5_sha1_prov.c
+++ b/providers/default/digests/md5_sha1_prov.c
@@ -7,14 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
-
 #include <string.h>
 #include <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/params.h>
 #include <openssl/core_names.h>
-#include "internal/core_mkdigest.h"
 #include "internal/md5_sha1.h"
+#include "internal/digestcommon.h"
 #include "internal/provider_algs.h"
 
 static OSSL_OP_digest_set_ctx_params_fn md5_sha1_set_ctx_params;
@@ -45,8 +44,8 @@ static int md5_sha1_set_ctx_params(void *vctx, const OSSL_PARAM params[])
     return 0;
 }
 
-OSSL_FUNC_DIGEST_CONSTRUCT_PARAMS(md5_sha1, MD5_SHA1_CTX,
-                                  MD5_SHA1_CBLOCK, MD5_SHA1_DIGEST_LENGTH, 0,
-                                  md5_sha1_init, md5_sha1_update, md5_sha1_final,
-                                  md5_sha1_settable_ctx_params,
-                                  md5_sha1_set_ctx_params)
+/* 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,
+    md5_sha1_settable_ctx_params, md5_sha1_set_ctx_params)