From: Tim Hudson <tjh@openssl.org>
Date: Mon, 20 Oct 2014 05:12:17 +0000 (+1000)
Subject: no-ssl2 with no-ssl3 does not mean drop the ssl lib
X-Git-Tag: OpenSSL_1_0_0p~65
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b7eaea7397f7ab67cd3246034f50df71db15c26f;p=oweals%2Fopenssl.git

no-ssl2 with no-ssl3 does not mean drop the ssl lib

Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit c882abd52269a59ed8e0510e5febf667428ece85)
---

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index afe8c7326d..ecba6a2b58 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -634,12 +634,6 @@ foreach (values %lib_nam)
 	$lib_obj=$lib_obj{$_};
 	local($slib)=$shlib;
 
-	if (($_ eq "SSL") && $no_ssl2 && $no_ssl3)
-		{
-		$rules.="\$(O_SSL):\n\n"; 
-		next;
-		}
-
 	$defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);
 	$lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)";
 	$rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);