From 21dfaf13d16be4bcbf44d8e58c3a37439b8ca822 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Tue, 15 Apr 2014 18:02:05 +0000
Subject: Remove the GOST engine: It is not compiled or used and depends on the
 "dynamic engine" feature that is not enabled in our build.  People who need
 it can still pull it out of the Attic; if it is to have a Russian engine just
 because it's a Russian engine.

OK deraadt@ beck@
---
 src/lib/libcrypto/engine/eng_all.c | 3 ---
 src/lib/libcrypto/engine/engine.h  | 3 ---
 src/lib/libcrypto/util/mk1mf.pl    | 1 -
 src/lib/libcrypto/util/mkfiles.pl  | 1 -
 4 files changed, 8 deletions(-)

(limited to 'src/lib/libcrypto')

diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index 2fbfc448fd..f318ea69c4 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -86,9 +86,6 @@ void ENGINE_load_builtin_engines(void)
 	ENGINE_load_padlock();
 #endif
 #endif
-#ifndef OPENSSL_NO_GOST
-	ENGINE_load_gost();
-#endif
 #endif
 	ENGINE_register_all_complete();
 	}
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 425720e988..096c271b61 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -317,9 +317,6 @@ void ENGINE_load_openssl(void);
 void ENGINE_load_dynamic(void);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 void ENGINE_load_padlock(void);
-#ifndef OPENSSL_NO_GOST
-void ENGINE_load_gost(void);
-#endif
 #endif
 void ENGINE_load_cryptodev(void);
 void ENGINE_load_rsax(void);
diff --git a/src/lib/libcrypto/util/mk1mf.pl b/src/lib/libcrypto/util/mk1mf.pl
index 72fa089f6b..48de99f66c 100644
--- a/src/lib/libcrypto/util/mk1mf.pl
+++ b/src/lib/libcrypto/util/mk1mf.pl
@@ -782,7 +782,6 @@ sub var_add
 	return("") if $no_dsa  && $dir =~ /\/dsa/;
 	return("") if $no_dh   && $dir =~ /\/dh/;
 	return("") if $no_ec   && $dir =~ /\/ec/;
-	return("") if $no_gost   && $dir =~ /\/ccgost/;
 	return("") if $no_cms  && $dir =~ /\/cms/;
 	return("") if $no_jpake  && $dir =~ /\/jpake/;
 	if ($no_des && $dir =~ /\/des/)
diff --git a/src/lib/libcrypto/util/mkfiles.pl b/src/lib/libcrypto/util/mkfiles.pl
index 7d9a9d5e5c..3214f69ea5 100644
--- a/src/lib/libcrypto/util/mkfiles.pl
+++ b/src/lib/libcrypto/util/mkfiles.pl
@@ -67,7 +67,6 @@ my @dirs = (
 "ssl",
 "apps",
 "engines",
-"engines/ccgost",
 "test",
 "tools"
 );
-- 
cgit v1.2.3-55-g6feb