From: Richard Levitte <richard@levitte.org>
Date: Sat, 23 Jan 2016 21:58:51 +0000 (+0100)
Subject: Remove GOST again
X-Git-Tag: OpenSSL_1_1_0-pre3~426
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9e4d6fbf3d061449b3c42b0b64b511221ba6483b;p=openssl

Remove GOST again

The config for the removed GOST engine reappeared by mistake.  Now
removed again.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/Configure b/Configure
index b1d6259e89..20ee02d81d 100755
--- a/Configure
+++ b/Configure
@@ -275,7 +275,6 @@ my @disablables = (
     "ec_nistp_64_gcc_128",
     "engine",
     "err",			# Really???
-    "gost",
     "heartbeats",
     "hmac",
     "hw(-.+)?",
@@ -358,9 +357,7 @@ my @disable_cascades = (
     "zlib"		=> [ "zlib-dynamic" ],
     "rijndael"		=> [ "aes" ],
     "des"		=> [ "mdc2" ],
-    "ec"		=> [ "ecdsa", "ecdh", "gost" ],
-    "dsa"		=> [ "gost" ],
-    "dh"		=> [ "gost" ],
+    "ec"		=> [ "ecdsa", "ecdh" ],
     "psk"		=> [ "jpake" ],
 
     "dgram"		=> [ "dtls" ],
@@ -761,8 +758,6 @@ foreach (sort (keys %disabled))
 		{ $no_sse2 = 1; }
 	elsif (/^engine$/)
 		{ @{$config{dirs}} = grep !/^engine$/, @{$config{dirs}}; }
-	elsif (/^gost$/)
-		{ @{$config{engdirs}} = grep !/^ccgost$/, @{$config{engdirs}}; }
 	else
 		{
 		my ($ALGO, $algo);