|
100 | 100 | copy("$src_dir/providers/common/include/prov/der_digests.h", |
101 | 101 | "$base_dir/providers/common/include/prov/") or die "Copy failed: $!"; |
102 | 102 |
|
| 103 | +my $linker_script_dir = "\$(srcdir)/deps/openssl/config/archs/$arch/$asm/providers"; |
103 | 104 | my $fips_linker_script = ""; |
104 | 105 | if ($fips_ld ne "") { |
105 | | - $fips_linker_script = "$base_dir/providers/fips.ld"; |
| 106 | + $fips_linker_script = "$linker_script_dir/fips.ld"; |
106 | 107 | copy("$src_dir/providers/fips.ld", |
107 | | - $fips_linker_script) or die "Copy failed: $!"; |
| 108 | + "$base_dir/providers/fips.ld") or die "Copy failed: $!"; |
108 | 109 | } |
109 | 110 |
|
110 | 111 |
|
|
193 | 194 | } |
194 | 195 | } |
195 | 196 |
|
| 197 | +foreach my $obj (@{$unified_info{sources}->{'providers/legacy'}}) { |
| 198 | + if ($obj eq 'providers/legacy.ld') { |
| 199 | + push(@generated_srcs, $obj); |
| 200 | + } else { |
| 201 | + my $src = ${$unified_info{sources}->{$obj}}[0]; |
| 202 | + #print("providers/fips obj: $obj, src: $src\n"); |
| 203 | + if ($src =~ m/\.c$/) { |
| 204 | + push(@libcrypto_srcs, $src); |
| 205 | + } |
| 206 | + } |
| 207 | +} |
| 208 | + |
196 | 209 | my @libfips_srcs = (); |
197 | 210 | foreach my $obj (@{$unified_info{sources}->{'providers/libfips.a'}}) { |
198 | 211 | my $src = ${$unified_info{sources}->{$obj}}[0]; |
|
316 | 329 | arch => \$arch, |
317 | 330 | lib_cppflags => \@lib_cppflags, |
318 | 331 | is_win => \$is_win, |
319 | | - linker_script => \rel2abs($fips_linker_script), |
| 332 | + linker_script => $fips_linker_script, |
320 | 333 | }); |
321 | 334 |
|
322 | 335 | open(FIPSGYPI, "> ./archs/$arch/$asm/openssl-fips.gypi"); |
|
0 commit comments