summaryrefslogtreecommitdiff
path: root/lib/libcrypto/engine
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2014-04-13 18:50:37 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2014-04-13 18:50:37 +0000
commiteac56b2cc0ee9e4566c2ad28f6742fb38ca9968e (patch)
treeff451f40d01db5a7a5dd3154392f3840fa5abbed /lib/libcrypto/engine
parentb3b38e3d620f2bce6e56cfebd4d1182885d17cec (diff)
Remove the Atalla engine: It is not standalone and depends on external
non-free libraries. OpenSSL should have a better way to include 3rd party engines: either completely free or external. But including a wrapper for a non-free wrapper in the code base does not make much sense and could also be provided by the vendor. ok deraadt@
Diffstat (limited to 'lib/libcrypto/engine')
-rw-r--r--lib/libcrypto/engine/eng_all.c3
-rw-r--r--lib/libcrypto/engine/engine.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/lib/libcrypto/engine/eng_all.c b/lib/libcrypto/engine/eng_all.c
index f38a73773cc..43fb3caf7d0 100644
--- a/lib/libcrypto/engine/eng_all.c
+++ b/lib/libcrypto/engine/eng_all.c
@@ -85,9 +85,6 @@ void ENGINE_load_builtin_engines(void)
#ifndef OPENSSL_NO_HW_AEP
ENGINE_load_aep();
#endif
-#ifndef OPENSSL_NO_HW_ATALLA
- ENGINE_load_atalla();
-#endif
#ifndef OPENSSL_NO_HW_NCIPHER
ENGINE_load_chil();
#endif
diff --git a/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h
index 289ac5cdac2..948b5a18ff2 100644
--- a/lib/libcrypto/engine/engine.h
+++ b/lib/libcrypto/engine/engine.h
@@ -334,7 +334,6 @@ void ENGINE_load_openssl(void);
void ENGINE_load_dynamic(void);
#ifndef OPENSSL_NO_STATIC_ENGINE
void ENGINE_load_aep(void);
-void ENGINE_load_atalla(void);
void ENGINE_load_chil(void);
void ENGINE_load_nuron(void);
void ENGINE_load_padlock(void);