diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-02-25 19:40:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-03-03 14:47:43 +0100 |
| commit | c9b0214edeb7fdbedd36cf403583e016d9fbbd38 (patch) | |
| tree | e87d05d3fc8577419cc8d3164f54bcd80ca327bd | |
| parent | TEST: Remove the build of fipsmodule.cnf from test recipes (diff) | |
| download | openssl-c9b0214edeb7fdbedd36cf403583e016d9fbbd38.tar.xz openssl-c9b0214edeb7fdbedd36cf403583e016d9fbbd38.zip | |
Fix the perl code to get FIPSMODULENAME
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14320)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 3 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 3 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 64ccc7a6c8..a3b3a44785 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -122,12 +122,13 @@ SHLIB_TARGET={- $target{shared_target} -} LIBS={- join(", ", map { "-\n\t".$_.".OLB" } @libs) -} SHLIBS={- join(", ", map { "-\n\t".$_.".EXE" } @shlibs) -} FIPSMODULENAME={- # We do some extra checking here, as there should be only one + use File::Basename; 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) -} + join(", ", map { basename(platform->dso($_)) } @fipsmodules) -} MODULES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{modules}}) -} PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{programs}}) -} SCRIPTS={- join(", ", map { "-\n\t".$_ } @{$unified_info{scripts}}) -} diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index f0095d9fd6..249652296c 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -89,12 +89,13 @@ MODULES={- join(" \\\n" . ' ' x 8, map { platform->dso($_) } @{$unified_info{modules}})) -} FIPSMODULENAME={- # We do some extra checking here, as there should be only one + use File::Basename; 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) -} + join(" ", map { basename(platform->dso($_)) } @fipsmodules) -} PROGRAMS={- join(" \\\n" . ' ' x 9, fill_lines(" ", $COLUMNS - 9, diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index e9b284d501..846c500bef 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -52,12 +52,13 @@ 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 + use File::Basename; 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) -} + 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) -} |