/[gentoo-alt]/trunk/prefix/dev-libs/openssl/files/openssl-0.9.7e-no-fips.patch
Gentoo

Contents of /trunk/prefix/dev-libs/openssl/files/openssl-0.9.7e-no-fips.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 920 - (show annotations) (download)
Tue Dec 13 20:55:14 2005 UTC (12 years, 7 months ago) by kito
File size: 1344 byte(s)
drop -overlay
1 Ripped from fedora
2
3 --- openssl-0.9.7e/Configure
4 +++ openssl-0.9.7e/Configure
5 @@ -1161,15 +1161,21 @@
6
7 $bn_obj = $bn_asm unless $bn_obj ne "";
8
9 +my $fips_des_obj;
10 +my $fips_sha1_obj;
11 if ($fips)
12 {
13 + if ($des_obj =~ /\-elf\.o$/ && $no_shared) # FIPS DES module is not PIC
14 + {
15 + $fips_des_obj='asm/fips-dx86-elf.o';
16 + $openssl_other_defines.="#define OPENSSL_FIPS_DES_ASM\n";
17 + }
18 + else { $fips_des_obj=$fips_des_enc; }
19 + $fips_sha1_obj='asm/sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/);
20 $des_obj=$sha1_obj="";
21 $openssl_other_defines.="#define OPENSSL_FIPS\n";
22 }
23 -$des_obj=$des_enc unless (!$fips && $des_obj =~ /\.o$/);
24 -my $fips_des_obj='asm/fips-dx86-elf.o';
25 -$fips_des_obj=$fips_des_enc unless $processor eq '386';
26 -my $fips_sha1_obj='asm/sx86-elf.o' if $processor eq '386';
27 +$des_obj=$des_enc unless ($des_obj =~ /\.o$/);
28 $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/);
29 $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/);
30 $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/);
31 --- openssl-0.9.7e/Makefile.org
32 +++ openssl-0.9.7e/Makefile.org
33 @@ -176,8 +176,8 @@
34 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
35 SHLIB_MARK=
36
37 -DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools
38 -SHLIBDIRS= fips crypto ssl
39 +DIRS= crypto ssl $(SHLIB_MARK) sigs apps test tools
40 +SHLIBDIRS= crypto ssl
41
42 # dirs in crypto to build
43 SDIRS= objects \

  ViewVC Help
Powered by ViewVC 1.1.20