QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-07 06:59:41 +00:00
Code Issues Projects Releases Wiki Activity

Make fipsinstall -out flag optional

Browse Source 
If -out is not specified, send output to stdout.
Fix documentation errors.
Remove "-out -" from an invocation.

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14623)
This commit is contained in:
Rich Salz 2021-03-19 12:05:59 -04:00 committed by Richard Levitte
parent b238e78fe8
commit eb78f95523
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/fipsinstall.c
View File

@ -376,7 +376,7 @@ opthelp:
/* No extra arguments. */ /* No extra arguments. */
argc = opt_num_rest(); argc = opt_num_rest();
if (argc != 0) if (argc != 0 || (verify && in_fname == NULL))
goto opthelp; goto opthelp;
if (parent_config != NULL) { if (parent_config != NULL) {
@ -389,9 +389,7 @@ opthelp:
} }
goto end; goto end;
} }
if (module_fname == NULL if (module_fname == NULL)
|| (verify && in_fname == NULL)
|| (!verify && out_fname == NULL))
goto opthelp; goto opthelp;
tail = opt_path_end(module_fname); tail = opt_path_end(module_fname);
@ -490,7 +488,9 @@ opthelp:
if (!load_fips_prov_and_run_self_test(prov_name)) if (!load_fips_prov_and_run_self_test(prov_name))
goto end; goto end;
fout = bio_open_default(out_fname, 'w', FORMAT_TEXT); fout =
out_fname == NULL ? dup_bio_out(FORMAT_TEXT)
: bio_open_default(out_fname, 'w', FORMAT_TEXT);
if (fout == NULL) { if (fout == NULL) {
BIO_printf(bio_err, "Failed to open file\n"); BIO_printf(bio_err, "Failed to open file\n");
goto end; goto end;

4
doc/man1/openssl-fipsinstall.pod.in
View File

@ -88,8 +88,8 @@ Filename to output the configuration data to; the default is standard output.
=item B<-in> I<configfilename> =item B<-in> I<configfilename>
Input filename to load configuration data from. Used with the B<-verify> option. Input filename to load configuration data from.
Standard input is used if the filename is C<->. Must be used if the B<-verify> option is specified.
=item B<-verify> =item B<-verify>

2
providers/build.info
View File

@ -150,7 +150,7 @@ IF[{- !$disabled{fips} -}]
DEPEND[|tests|]=fipsmodule.cnf DEPEND[|tests|]=fipsmodule.cnf
GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \ GENERATE[fipsmodule.cnf]=../apps/openssl fipsinstall \
-module providers/$(FIPSMODULENAME) -provider_name fips \ -module providers/$(FIPSMODULENAME) -provider_name fips \
-mac_name HMAC -section_name fips_sect -out - -mac_name HMAC -section_name fips_sect
DEPEND[fipsmodule.cnf]=$FIPSGOAL DEPEND[fipsmodule.cnf]=$FIPSGOAL
ENDIF ENDIF