Configure/Makefile: fix the -macopt argument of the fipsinstall com…

…mand The FIPS hmac key is provided as a hexadezimal string, which needs to be be prefixed with `hexkey:`, not `key:`. Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from openssl#13684)
Lamoracke1 · Apr 29, 2021 · 59cf286 · 59cf286
1 parent f4585ae
commit 59cf286
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"