Remove fipsdso target: it isn't supported in the 2.0 module.
authorDr. Stephen Henson <steve@openssl.org>
Wed, 14 Sep 2011 15:20:59 +0000 (15:20 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Wed, 14 Sep 2011 15:20:59 +0000 (15:20 +0000)
Configure

index 1f43935..1a80afa 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -656,7 +656,6 @@ my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
 my $cross_compile_prefix="";
 my $fipslibdir="/usr/local/ssl/fips-2.0/lib/";
 my $nofipscanistercheck=0;
 my $cross_compile_prefix="";
 my $fipslibdir="/usr/local/ssl/fips-2.0/lib/";
 my $nofipscanistercheck=0;
-my $fipsdso=0;
 my $fipscanisterinternal="n";
 my $fipscanisteronly = 0;
 my $baseaddr="0xFB00000";
 my $fipscanisterinternal="n";
 my $fipscanisteronly = 0;
 my $baseaddr="0xFB00000";
@@ -897,14 +896,6 @@ EOF
                        $fipscanisterinternal="y";
                        $fipscanisteronly = 1;
                        }
                        $fipscanisterinternal="y";
                        $fipscanisteronly = 1;
                        }
-               elsif (/^fipsdso$/)
-                       {
-                       $fips = 1;
-                       $nofipscanistercheck = 1;
-                       $fipslibdir="";
-                       $fipscanisterinternal="y";
-                       $fipsdso = 1;
-                       }
                elsif (/^[-+]/)
                        {
                        if (/^-[lL](.*)$/ or /^-Wl,/)
                elsif (/^[-+]/)
                        {
                        if (/^-[lL](.*)$/ or /^-Wl,/)
@@ -1713,18 +1704,9 @@ while (<IN>)
        s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
        s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
        s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
        s/^LIBZLIB=.*/LIBZLIB=$withargs{"zlib-lib"}/;
        s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
        s/^FIPSLIBDIR=.*/FIPSLIBDIR=$fipslibdir/;
-       if ($fipsdso)
-               {
-               s/^FIPSCANLIB=.*/FIPSCANLIB=libfips/;
-               s/^SHARED_FIPS=.*/SHARED_FIPS=libfips\$(SHLIB_EXT)/;
-               s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl fips/;
-               }
-       else
-               {
-               s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips;
-               s/^SHARED_FIPS=.*/SHARED_FIPS=/;
-               s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/;
-               }
+       s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/ if $fips;
+       s/^SHARED_FIPS=.*/SHARED_FIPS=/;
+       s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/;
        s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/;
        s/^BASEADDR=.*/BASEADDR=$baseaddr/;
        s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
        s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/;
        s/^BASEADDR=.*/BASEADDR=$baseaddr/;
        s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;