summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authorreyk <>2014-04-15 18:02:05 +0000
committerreyk <>2014-04-15 18:02:05 +0000
commit21dfaf13d16be4bcbf44d8e58c3a37439b8ca822 (patch)
treebd59631fac9f83412b03144f80629bc9dfafbcad /src/lib/libcrypto
parentae88eed991bcec3c745351e9462c854723700aa3 (diff)
downloadopenbsd-21dfaf13d16be4bcbf44d8e58c3a37439b8ca822.tar.gz
openbsd-21dfaf13d16be4bcbf44d8e58c3a37439b8ca822.tar.bz2
openbsd-21dfaf13d16be4bcbf44d8e58c3a37439b8ca822.zip
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@
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r--src/lib/libcrypto/engine/eng_all.c3
-rw-r--r--src/lib/libcrypto/engine/engine.h3
-rw-r--r--src/lib/libcrypto/util/mk1mf.pl1
-rw-r--r--src/lib/libcrypto/util/mkfiles.pl1
4 files changed, 0 insertions, 8 deletions
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)
86 ENGINE_load_padlock(); 86 ENGINE_load_padlock();
87#endif 87#endif
88#endif 88#endif
89#ifndef OPENSSL_NO_GOST
90 ENGINE_load_gost();
91#endif
92#endif 89#endif
93 ENGINE_register_all_complete(); 90 ENGINE_register_all_complete();
94 } 91 }
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);
317void ENGINE_load_dynamic(void); 317void ENGINE_load_dynamic(void);
318#ifndef OPENSSL_NO_STATIC_ENGINE 318#ifndef OPENSSL_NO_STATIC_ENGINE
319void ENGINE_load_padlock(void); 319void ENGINE_load_padlock(void);
320#ifndef OPENSSL_NO_GOST
321void ENGINE_load_gost(void);
322#endif
323#endif 320#endif
324void ENGINE_load_cryptodev(void); 321void ENGINE_load_cryptodev(void);
325void ENGINE_load_rsax(void); 322void 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
782 return("") if $no_dsa && $dir =~ /\/dsa/; 782 return("") if $no_dsa && $dir =~ /\/dsa/;
783 return("") if $no_dh && $dir =~ /\/dh/; 783 return("") if $no_dh && $dir =~ /\/dh/;
784 return("") if $no_ec && $dir =~ /\/ec/; 784 return("") if $no_ec && $dir =~ /\/ec/;
785 return("") if $no_gost && $dir =~ /\/ccgost/;
786 return("") if $no_cms && $dir =~ /\/cms/; 785 return("") if $no_cms && $dir =~ /\/cms/;
787 return("") if $no_jpake && $dir =~ /\/jpake/; 786 return("") if $no_jpake && $dir =~ /\/jpake/;
788 if ($no_des && $dir =~ /\/des/) 787 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 = (
67"ssl", 67"ssl",
68"apps", 68"apps",
69"engines", 69"engines",
70"engines/ccgost",
71"test", 70"test",
72"tools" 71"tools"
73); 72);