Skip to content

Commit

Permalink
Add command line option for setting provider in evp_test
Browse files Browse the repository at this point in the history
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from #22151)
  • Loading branch information
xhanulik authored and beldmit committed Sep 21, 2023
1 parent dee2129 commit 1bebf4b
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion test/evp_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ typedef enum OPTION_choice {
OPT_EOF = 0,
OPT_CONFIG_FILE,
OPT_IN_PLACE,
OPT_PROVIDER_NAME,
OPT_TEST_ENUM
} OPTION_CHOICE;

static OSSL_PROVIDER *prov_null = NULL;
static OSSL_PROVIDER *libprov = NULL;
static OSSL_LIB_CTX *libctx = NULL;

/* List of public and private keys */
Expand Down Expand Up @@ -4117,6 +4119,8 @@ const OPTIONS *test_get_options(void)
"The configuration file to use for the libctx" },
{ "process", OPT_IN_PLACE, 's',
"Mode for data processing by cipher tests [in_place/both], both by default"},
{ "provider", OPT_PROVIDER_NAME, 's',
"The provider to load (when no configuration file, the default value is 'default')" },
{ OPT_HELP_STR, 1, '-', "file\tFile to run tests on.\n" },
{ NULL }
};
Expand All @@ -4127,6 +4131,7 @@ int setup_tests(void)
{
size_t n;
char *config_file = NULL;
char *provider_name = NULL;

OPTION_CHOICE o;

Expand All @@ -4139,6 +4144,9 @@ int setup_tests(void)
if ((process_mode_in_place = evp_test_process_mode(opt_arg())) == -1)
return 0;
break;
case OPT_PROVIDER_NAME:
provider_name = opt_arg();
break;
case OPT_TEST_CASES:
break;
default:
Expand All @@ -4152,7 +4160,9 @@ int setup_tests(void)
* Load the 'null' provider into the default library context to ensure that
* the tests do not fallback to using the default provider.
*/
if (!test_get_libctx(&libctx, &prov_null, config_file, NULL, NULL))
if (config_file == NULL && provider_name == NULL)
provider_name = "default";
if (!test_get_libctx(&libctx, &prov_null, config_file, &libprov, provider_name))
return 0;

n = test_get_argument_count();
Expand All @@ -4165,6 +4175,7 @@ int setup_tests(void)

void cleanup_tests(void)
{
OSSL_PROVIDER_unload(libprov);
OSSL_PROVIDER_unload(prov_null);
OSSL_LIB_CTX_free(libctx);
}
Expand Down

0 comments on commit 1bebf4b

Please sign in to comment.