From d47d0d2b0de79706cea81dd6f0b118a0b406c95e Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 14 Sep 2011 15:20:59 +0000
Subject: [PATCH] Remove fipsdso target: it isn't supported in the 2.0 module.

---
 Configure | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/Configure b/Configure
index 1f43935a9b..1a80afaf03 100755
--- 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 $fipsdso=0;
 my $fipscanisterinternal="n";
 my $fipscanisteronly = 0;
 my $baseaddr="0xFB00000";
@@ -897,14 +896,6 @@ EOF
 			$fipscanisterinternal="y";
 			$fipscanisteronly = 1;
 			}
-		elsif (/^fipsdso$/)
-			{
-			$fips = 1;
-			$nofipscanistercheck = 1;
-			$fipslibdir="";
-			$fipscanisterinternal="y";
-			$fipsdso = 1;
-			}
 		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/;
-	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/;
-- 
2.34.1