diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-12-14 15:24:27 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-01-06 12:07:26 -0500 |
| commit | 700b4a4ae7c2a89ca99bfe64baef1eabfa316136 (patch) | |
| tree | ffe906e1a3f0b169233ef0dcadd50c948723d487 /util/mkdef.pl | |
| parent | 0b0443af6462724acf7b1ff2c624b124113f11a4 (diff) | |
| download | openssl-700b4a4ae7c2a89ca99bfe64baef1eabfa316136.tar.gz | |
Remove more (rest?) of FIPS build stuff.
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Diffstat (limited to 'util/mkdef.pl')
| -rwxr-xr-x | util/mkdef.pl | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index f9e9f748f1..877ea16a5d 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -63,8 +63,8 @@ my $linux=0; my $safe_stack_def = 0; my @known_platforms = ( "__FreeBSD__", "PERL5", - "EXPORT_VAR_AS_FUNCTION", "ZLIB", - "OPENSSL_FIPS", "OPENSSL_FIPSCAPABLE" ); + "EXPORT_VAR_AS_FUNCTION", "ZLIB" + ); my @known_ossl_platforms = ( "VMS", "WIN32", "WINNT", "OS2" ); my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "CAST", "MD2", "MD4", "MD5", "SHA", "SHA0", "SHA1", @@ -137,8 +137,6 @@ my $no_jpake; my $no_srp; my $no_ec2m; my $no_nistp_gcc; my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace; my $no_unit_test; my $no_ssl3_method; my $no_ocb; -my $fips; - my $zlib; @@ -164,7 +162,6 @@ foreach (@ARGV, split(/ /, $options)) } $VMS=1 if $_ eq "VMS"; $OS2=1 if $_ eq "OS2"; - $fips=1 if /^fips/; if ($_ eq "zlib" || $_ eq "enable-zlib" || $_ eq "zlib-dynamic" || $_ eq "enable-zlib-dynamic") { $zlib = 1; @@ -1165,12 +1162,6 @@ sub is_valid if ($keyword eq "EXPORT_VAR_AS_FUNCTION" && ($VMSVAX || $W32)) { return 1; } - if ($keyword eq "OPENSSL_FIPSCAPABLE") { - return 0; - } - if ($keyword eq "OPENSSL_FIPS" && $fips) { - return 1; - } if ($keyword eq "ZLIB" && $zlib) { return 1; } return 0; } else { @@ -1555,7 +1546,6 @@ sub update_numbers next if defined($rsyms{$sym}); die "ERROR: Symbol $sym had no info attached to it." if $i eq ""; - next if $i =~ /OPENSSL_FIPSCAPABLE/; if (!exists $nums{$s}) { $new_syms++; my $s2 = $s; |