cleanup provider digests

[thirdparty/openssl.git] / providers / legacy / digests / mdc2_prov.c

diff --git a/providers/legacy/digests/mdc2_prov.c b/providers/legacy/digests/mdc2_prov.c
index 51e3352cfc3138649d40485ceec5e83ec232804c..b30d50327d2db4622908257f9e9cb63d154ae45e 100644 (file)
--- a/providers/legacy/digests/mdc2_prov.c
+++ b/providers/legacy/digests/mdc2_prov.c
@@ -11,9 +11,10 @@
 #include <openssl/params.h>
 #include <openssl/mdc2.h>
 #include <openssl/core_names.h>
-
-#include "internal/core_mkdigest.h"
+#include <openssl/err.h>
+#include "internal/digestcommon.h"
 #include "internal/provider_algs.h"
+#include "internal/providercommonerr.h"
 
 static OSSL_OP_digest_set_ctx_params_fn mdc2_set_ctx_params;
 static OSSL_OP_digest_settable_ctx_params_fn mdc2_settable_ctx_params;
@@ -35,14 +36,17 @@ static int mdc2_set_ctx_params(void *vctx, const OSSL_PARAM params[])
 
     if (ctx != NULL && params != NULL) {
         p = OSSL_PARAM_locate_const(params, OSSL_DIGEST_PARAM_PAD_TYPE);
-        if (p != NULL && !OSSL_PARAM_get_int(p, &ctx->pad_type))
+        if (p != NULL && !OSSL_PARAM_get_int(p, &ctx->pad_type)) {
+            ERR_raise(ERR_LIB_PROV, PROV_R_FAILED_TO_GET_PARAMETER);
             return 0;
+        }
         return 1;
     }
     return 0; /* Null Parameter */
 }
 
-OSSL_FUNC_DIGEST_CONSTRUCT_PARAMS(mdc2, MDC2_CTX,
-                                  MDC2_BLOCK, MDC2_DIGEST_LENGTH, 0,
-                                  MDC2_Init, MDC2_Update, MDC2_Final,
-                                  mdc2_settable_ctx_params, mdc2_set_ctx_params)
+/* mdc2_functions */
+IMPLEMENT_digest_functions_with_settable_ctx(
+    mdc2, MDC2_CTX, MDC2_BLOCK, MDC2_DIGEST_LENGTH, 0,
+    MDC2_Init, MDC2_Update, MDC2_Final,
+    mdc2_settable_ctx_params, mdc2_set_ctx_params)