From 59cf2869199b695cace97869c578d40fafff24c6 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Tue, 15 Dec 2020 19:41:58 +0100 Subject: [PATCH] Configure/Makefile: fix the `-macopt` argument of the fipsinstall command The FIPS hmac key is provided as a hexadezimal string, which needs to be be prefixed with `hexkey:`, not `key:`. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/13684) --- Configurations/descrip.mms.tmpl | 2 +- Configurations/unix-Makefile.tmpl | 2 +- Configurations/windows-makefile.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 065854d2ea..920c0abfeb 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -544,7 +544,7 @@ install_fips: install_sw openssl fipsinstall - -module ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME) - -out ossl_installroot:[MODULES{- $sover_dirname.$target{pointer_size} -}.'arch']$(FIPSMODULENAME).cnf - - -macopt "key:$(FIPSKEY)" + -macopt "hexkey:$(FIPSKEY)" uninstall_fips: uninstall_sw @ WRITE SYS$OUTPUT "*** Uninstalling FIPS module configuration" diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index e2df304061..e7287b6290 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -590,7 +590,7 @@ install_fips: install_sw @$(ECHO) "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" @openssl fipsinstall -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \ -out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \ - -macopt 'key:$(FIPSKEY)' + -macopt 'hexkey:$(FIPSKEY)' uninstall_fips: uninstall_sw @$(ECHO) "*** Uninstalling FIPS module configuration" diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 2cd003cf89..24db68fa06 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -475,7 +475,7 @@ install_fips: install_sw @$(ECHO) "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" @openssl fipsinstall -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \ -out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \ - -macopt "key:$(FIPSKEY)" + -macopt "hexkey:$(FIPSKEY)" uninstall_fips: uninstall_sw @$(ECHO) "*** Uninstalling FIPS module configuration" -- 2.34.1