diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2015-02-03 22:53:15 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2015-02-04 18:54:36 +0000 |
commit | 5496cd3e5d9a0ab4c1235bdda9872eeb5ec130bb (patch) | |
tree | 5473753f8136347a5229901d2fa03813f95a05e8 /Configure | |
parent | 6922ddee1b7b1bddbe0d59a5bbdcf8ff39343434 (diff) | |
download | openssl-5496cd3e5d9a0ab4c1235bdda9872eeb5ec130bb.tar.gz |
More unused FIPS module code.
Remove fips_algvs.c
Remove unused fips module build code from Configure and Makefile.org
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 34 |
1 files changed, 1 insertions, 33 deletions
@@ -1124,24 +1124,7 @@ my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); $exe_ext=".nlm" if ($target =~ /netware/); $exe_ext=".pm" if ($target =~ /vos/); -if ($openssldir eq "" and $prefix eq "") - { - if ($fips) - { - if (exists $ENV{FIPSDIR}) - { - $openssldir="$ENV{FIPSDIR}"; - } - else - { - $openssldir="/usr/local/ssl/fips-2.0"; - } - } - else - { - $openssldir="/usr/local/ssl"; - } - } +$openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); $prefix=$openssldir if $prefix eq ""; $default_ranlib= &which("ranlib") or $default_ranlib="true"; @@ -1149,10 +1132,6 @@ $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") or $perl="perl"; my $make = $ENV{'MAKE'} || "make"; -my $fips_auth_key = $ENV{'FIPS_AUTH_KEY'}; -my $fips_auth_officer = $ENV{'FIPS_AUTH_OFFICER'}; -my $fips_auth_user = $ENV{'FIPS_AUTH_USER'}; - $cross_compile_prefix=$ENV{'CROSS_COMPILE'} if $cross_compile_prefix eq ""; chop $openssldir if $openssldir =~ /\/$/; @@ -2027,16 +2006,9 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN -#if defined(FIPS) - VALUE "Comments", "WARNING: TEST VERSION ONLY ***NOT*** FIPS 140-2 VALIDATED.\\0" -#endif // Required: VALUE "CompanyName", "The OpenSSL Project, http://www.openssl.org/\\0" -#if defined(FIPS) - VALUE "FileDescription", "TEST UNVALIDATED FIPS140-2 DLL\\0" -#else VALUE "FileDescription", "OpenSSL Shared Library\\0" -#endif VALUE "FileVersion", "$version\\0" #if defined(CRYPTO) VALUE "InternalName", "libeay32\\0" @@ -2044,10 +2016,6 @@ BEGIN #elif defined(SSL) VALUE "InternalName", "ssleay32\\0" VALUE "OriginalFilename", "ssleay32.dll\\0" -#elif defined(FIPS) - VALUE "InternalName", "libosslfips\\0" - VALUE "OriginalFilename", "libosslfips.dll\\0" -#endif VALUE "ProductName", "The OpenSSL Toolkit\\0" VALUE "ProductVersion", "$version\\0" // Optional: |