diff options
author | Shane Lontis <shane.lontis@oracle.com> | 2021-06-07 11:33:28 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-06-08 15:18:00 +1000 |
commit | 69e0f8cca691dc474300422c48e14713ace8dd2c (patch) | |
tree | 341e44f5d4b8cf789329b1663a6d8a1d0062dcee /Configurations | |
parent | 5d43bfa7d58c6af5e40d6615edc83c709df2852b (diff) |
Fix AIX FIPS DEP.
The entry point needs the option 'binitfini', but it was not being
added since the perl code to detect the match did not work.
The entry point for AIX is no longer static - so a wrapper has been
added to call the static version.
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15636)
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/10-main.conf | 2 | ||||
-rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index a07624e96b..138ad8a6ae 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1180,7 +1180,7 @@ my %targets = ( module_ldflags => "-Wl,-G,-bsymbolic,-bnoentry", shared_ldflag => "-Wl,-G,-bsymbolic,-bnoentry", shared_defflag => "-Wl,-bE:", - shared_fipsflag => "-Wl,-binitfini:init:cleanup", + shared_fipsflag => "-Wl,-binitfini:_init:_cleanup", perl_platform => 'AIX', }, "aix-gcc" => { diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 80f38dd1a2..ff04e65163 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1838,7 +1838,7 @@ EOF my @deps = compute_lib_depends(@{$args{deps}}); my $shared_def = join("", map { ' '.$target{shared_defflag}.$_ } @defs); # Next line needs to become "less magic" (see PR #11950) - $shared_def .= ' '.$target{shared_fipsflag} if (m/providers\/fips/ && defined $target{shared_fipsflag}); + $shared_def .= ' '.$target{shared_fipsflag} if (defined $target{shared_fipsflag} && $shared_def =~ m/providers\/fips/); my $objs = join(" \\\n\t\t", fill_lines(' ', $COLUMNS - 16, @objs)); my $deps = join(" \\\n" . ' ' x (length($dso) + 2), fill_lines(' ', $COLUMNS - length($dso) - 2, |