mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-30 14:01:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Configure/Makefile: fix the -macopt argument of the fipsinstall command

Browse Source 
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 https://github.com/openssl/openssl/pull/13684)
This commit is contained in:
Dr. Matthias St. Pierre 2020-12-15 19:41:58 +01:00
parent f4585aeca9
commit 59cf286919
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configurations/descrip.mms.tmpl
View File

@ -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"

2
Configurations/unix-Makefile.tmpl
View File

@ -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"

2
Configurations/windows-makefile.tmpl
View File

@ -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"