diff options
author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-04-15 18:02:06 +0000 |
---|---|---|
committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-04-15 18:02:06 +0000 |
commit | 1cd1a61ace1c94c3914025bd561f5f7382ef64a0 (patch) | |
tree | 5a0fe7744c2cbece275e30dd4d4fa640b68482c2 /lib | |
parent | bbeb3f5222ca7a9778752167c29b1e10329251e3 (diff) |
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 'lib')
-rw-r--r-- | lib/libcrypto/engine/eng_all.c | 3 | ||||
-rw-r--r-- | lib/libcrypto/engine/engine.h | 3 | ||||
-rw-r--r-- | lib/libcrypto/util/mk1mf.pl | 1 | ||||
-rw-r--r-- | lib/libcrypto/util/mkfiles.pl | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/lib/libcrypto/engine/eng_all.c b/lib/libcrypto/engine/eng_all.c index 2fbfc448fd5..f318ea69c42 100644 --- a/lib/libcrypto/engine/eng_all.c +++ b/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/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h index 425720e9886..096c271b614 100644 --- a/lib/libcrypto/engine/engine.h +++ b/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/lib/libcrypto/util/mk1mf.pl b/lib/libcrypto/util/mk1mf.pl index 72fa089f6b9..48de99f66c5 100644 --- a/lib/libcrypto/util/mk1mf.pl +++ b/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/lib/libcrypto/util/mkfiles.pl b/lib/libcrypto/util/mkfiles.pl index 7d9a9d5e5c9..3214f69ea5e 100644 --- a/lib/libcrypto/util/mkfiles.pl +++ b/lib/libcrypto/util/mkfiles.pl @@ -67,7 +67,6 @@ my @dirs = ( "ssl", "apps", "engines", -"engines/ccgost", "test", "tools" ); |