diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-09-29 18:31:44 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-10-08 11:29:23 +0200 |
| commit | 403a5edcde4f2cd76f04b519224b13228ee1b0ff (patch) | |
| tree | 0b5a16af4e741ca91872212d6529af25f9266c21 /Configurations | |
| parent | a1bfcb15d97b9cbb761dd7b4b2173d5b2b4dd2e5 (diff) | |
windows-makefile.tmpl: Add a target to install the FIPS module config
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13032)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index dfabda7eef..ce042d6ee8 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -51,6 +51,13 @@ SHLIBPDBS={- join(" ", map { platform->sharedlibpdb($_) // () } @{$unified_info{ MODULES={- our @MODULES = map { platform->dso($_) } @{$unified_info{modules}}; join(" ", @MODULES) -} MODULEPDBS={- join(" ", map { platform->dsopdb($_) } @{$unified_info{modules}}) -} +FIPSMODULENAME={- # We do some extra checking here, as there should be only one + my @fipsmodules = + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && $unified_info{attributes}->{modules}->{$_}->{fips} } + @{$unified_info{modules}}; + die "More that one FIPS module" if scalar @fipsmodules > 1; + join(" ", map { basename platform->dso($_) } @fipsmodules) -} PROGRAMS={- our @PROGRAMS = map { platform->bin($_) } @{$unified_info{programs}}; join(" ", @PROGRAMS) -} PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -} SCRIPTS={- our @SCRIPTS = @{$unified_info{scripts}}; join(" ", @SCRIPTS) -} @@ -463,6 +470,18 @@ install_docs: install_html_docs uninstall_docs: uninstall_html_docs +install_fips: install_sw + @$(ECHO) "*** Installing FIPS module configuration" + @$(ECHO) "fipsinstall $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" + @openssl fipsinstall -module $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME) \ + -out $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf \ + -macopt "key:$(FIPSKEY)" + +uninstall_fips: uninstall_sw + @$(ECHO) "*** Uninstalling FIPS module configuration" + @$(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf" + @$(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).cnf + install_ssldirs: @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\certs" @"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(OPENSSLDIR)\private" |