From: Pauli <ppzgs1@gmail.com>
Date: Thu, 25 Feb 2021 03:47:36 +0000 (+1000)
Subject: apps: update mac to work with additional MAC_init arguments.  This doesn't include... 
X-Git-Tag: openssl-3.0.0-alpha13~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2211bf6bb795c59f43aa93d746c46de63843d7cd;p=thirdparty%2Fopenssl.git

apps: update mac to work with additional MAC_init arguments.  This doesn't include the creation of new 'key' arguments.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14310)
---

diff --git a/apps/mac.c b/apps/mac.c
index 6280fdcd3bc..8f8dcde3183 100644
--- a/apps/mac.c
+++ b/apps/mac.c
@@ -64,6 +64,7 @@ int mac_main(int argc, char **argv)
     const char *infile = NULL;
     int out_bin = 0;
     int inform = FORMAT_BINARY;
+    OSSL_PARAM *params = NULL;
 
     prog = opt_init(argc, argv, mac_options);
     buf = app_malloc(BUFSIZE, "I/O buffer");
@@ -117,9 +118,9 @@ opthelp:
 
     if (opts != NULL) {
         int ok = 1;
-        OSSL_PARAM *params =
-            app_params_new_from_opts(opts, EVP_MAC_settable_ctx_params(mac));
 
+        params = app_params_new_from_opts(opts,
+                                          EVP_MAC_settable_ctx_params(mac));
         if (params == NULL)
             goto err;
 
@@ -144,7 +145,7 @@ opthelp:
     if (out == NULL)
         goto err;
 
-    if (!EVP_MAC_init(ctx)) {
+    if (!EVP_MAC_init(ctx, NULL, 0, NULL)) {
         BIO_printf(bio_err, "EVP_MAC_Init failed\n");
         goto err;
     }