Commit cd22dfbf authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Have all algorithm test programs call fips_algtest_init() at startup: 

this will perform all standalone operations such as setting error
callbacks, entering FIPS mode etc.
parent d4178c8f

fips/aes/fips_aesavs.c

+1 −5
Original line number Diff line number Diff line
@@ -867,12 +867,8 @@ int main(int argc, char **argv) 
    FILE *fp = NULL;

    char fn[250] = "", rfn[256] = "";

    int f_opt = 0, d_opt = 1;

    fips_set_error_print();

    fips_algtest_init();



#ifdef OPENSSL_FIPS

    if(!FIPS_mode_set(1))

	EXIT(1);

#endif

    if (argc > 1)

	{

	if (strcasecmp(argv[1], "-d") == 0)

fips/aes/fips_gcmtest.c

+1 −3
Original line number Diff line number Diff line
@@ -292,9 +292,7 @@ int main(int argc,char **argv) 
		fprintf(stderr,"%s [-encrypt|-decrypt]\n",argv[0]);

		exit(1);

		}

	fips_set_error_print();

	if(!FIPS_mode_set(1))

		exit(1);

	fips_algtest_init();

	if(!strcmp(argv[1],"-encrypt"))

		encrypt = 1;

	else if(!strcmp(argv[1],"-encryptIVext"))

fips/cmac/fips_cmactest.c

+1 −3
Original line number Diff line number Diff line
@@ -102,9 +102,7 @@ int main(int argc, char **argv) 
	int known_keylen = 0;	/* Only set when Klen_counts_keys = 1 */

	const EVP_CIPHER *cipher = 0;

	int ret = 1;

	fips_set_error_print();

	if(!FIPS_mode_set(1))

		goto end;

	fips_algtest_init();



	while (argc > 1 && argv[1][0] == '-')

		{

fips/des/fips_desmovs.c

+1 −5
Original line number Diff line number Diff line
@@ -633,11 +633,7 @@ int main(int argc, char **argv) 
    char fn[250] = "", rfn[256] = "";

    int f_opt = 0, d_opt = 1;



#ifdef OPENSSL_FIPS

    fips_set_error_print();

    if(!FIPS_mode_set(1))

	EXIT(1);

#endif

    fips_algtest_init();

    if (argc > 1)

	{

	if (strcasecmp(argv[1], "-d") == 0)

fips/dh/fips_dhvs.c

+1 −3
Original line number Diff line number Diff line
@@ -160,9 +160,7 @@ int main(int argc,char **argv) 
	char *keyword = NULL, *value = NULL;

	int do_verify = -1, exout = 0;



	fips_set_error_print();

	if(!FIPS_mode_set(1))

		exit(1);

	fips_algtest_init();



	if (argn && !strcmp(*args, "dhver"))

		{