|
@@ -22,8 +22,6 @@
|
|
|
DEFINE_STACK_OF_STRING()
|
|
|
|
|
|
#define BUFSIZE 4096
|
|
|
-#define DEFAULT_MAC_NAME "HMAC"
|
|
|
-#define DEFAULT_FIPS_SECTION "fips_check_section"
|
|
|
|
|
|
/* Configuration file values */
|
|
|
#define VERSION_KEY "version"
|
|
@@ -268,10 +266,12 @@ end:
|
|
|
int fipsinstall_main(int argc, char **argv)
|
|
|
{
|
|
|
int ret = 1, verify = 0, gotkey = 0, gotdigest = 0;
|
|
|
+ const char *section_name = "fips_sect";
|
|
|
+ const char *mac_name = "HMAC";
|
|
|
+ const char *prov_name = "fips";
|
|
|
BIO *module_bio = NULL, *mem_bio = NULL, *fout = NULL;
|
|
|
- char *in_fname = NULL, *out_fname = NULL, *prog, *section_name = NULL;
|
|
|
- char *prov_name = NULL, *module_fname = NULL;
|
|
|
- static const char *mac_name = DEFAULT_MAC_NAME;
|
|
|
+ char *in_fname = NULL, *out_fname = NULL, *prog;
|
|
|
+ char *module_fname = NULL;
|
|
|
EVP_MAC_CTX *ctx = NULL, *ctx2 = NULL;
|
|
|
STACK_OF(OPENSSL_STRING) *opts = NULL;
|
|
|
OPTION_CHOICE o;
|
|
@@ -283,7 +283,6 @@ int fipsinstall_main(int argc, char **argv)
|
|
|
EVP_MAC *mac = NULL;
|
|
|
CONF *conf = NULL;
|
|
|
|
|
|
- section_name = DEFAULT_FIPS_SECTION;
|
|
|
if ((opts = sk_OPENSSL_STRING_new_null()) == NULL)
|
|
|
goto end;
|
|
|
|
|
@@ -345,7 +344,7 @@ opthelp:
|
|
|
argc = opt_num_rest();
|
|
|
if (module_fname == NULL
|
|
|
|| (verify && in_fname == NULL)
|
|
|
- || (!verify && (out_fname == NULL || prov_name == NULL))
|
|
|
+ || (!verify && out_fname == NULL)
|
|
|
|| argc != 0)
|
|
|
goto opthelp;
|
|
|
|
|
@@ -357,7 +356,6 @@ opthelp:
|
|
|
/* Use the default FIPS HMAC digest and key if not specified. */
|
|
|
if (!gotdigest && !sk_OPENSSL_STRING_push(opts, "digest:SHA256"))
|
|
|
goto end;
|
|
|
- /* Use the default FIPS HMAC key if not specified. */
|
|
|
if (!gotkey && !sk_OPENSSL_STRING_push(opts, "hexkey:" FIPS_KEY_STRING))
|
|
|
goto end;
|
|
|
|