mirror of
https://github.com/openssl/openssl.git
synced 2024-11-21 01:15:20 +08:00
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)
This commit is contained in:
parent
ebf8274c55
commit
2211bf6bb7
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user