diff options
author | reyk <> | 2014-04-13 18:50:36 +0000 |
---|---|---|
committer | reyk <> | 2014-04-13 18:50:36 +0000 |
commit | 6851991ea11599a8a5923ff68d230d542d9185cd (patch) | |
tree | 86cbe1960d3ff2534c09dad8bd781c0e8d1823c5 /src/lib/libcrypto | |
parent | 26de2d98da4c165037bbc9cf0bc0c9734760a865 (diff) | |
download | openbsd-6851991ea11599a8a5923ff68d230d542d9185cd.tar.gz openbsd-6851991ea11599a8a5923ff68d230d542d9185cd.tar.bz2 openbsd-6851991ea11599a8a5923ff68d230d542d9185cd.zip |
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 'src/lib/libcrypto')
-rw-r--r-- | src/lib/libcrypto/doc/engine.pod | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/engine.h | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod index ba36974c45..b0cea78cd3 100644 --- a/src/lib/libcrypto/doc/engine.pod +++ b/src/lib/libcrypto/doc/engine.pod | |||
@@ -25,7 +25,6 @@ engine - ENGINE cryptographic module support | |||
25 | void ENGINE_load_dynamic(void); | 25 | void ENGINE_load_dynamic(void); |
26 | #ifndef OPENSSL_NO_STATIC_ENGINE | 26 | #ifndef OPENSSL_NO_STATIC_ENGINE |
27 | void ENGINE_load_aep(void); | 27 | void ENGINE_load_aep(void); |
28 | void ENGINE_load_atalla(void); | ||
29 | void ENGINE_load_chil(void); | 28 | void ENGINE_load_chil(void); |
30 | void ENGINE_load_gmp(void); | 29 | void ENGINE_load_gmp(void); |
31 | void ENGINE_load_nuron(void); | 30 | void ENGINE_load_nuron(void); |
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c index f38a73773c..43fb3caf7d 100644 --- a/src/lib/libcrypto/engine/eng_all.c +++ b/src/lib/libcrypto/engine/eng_all.c | |||
@@ -85,9 +85,6 @@ void ENGINE_load_builtin_engines(void) | |||
85 | #ifndef OPENSSL_NO_HW_AEP | 85 | #ifndef OPENSSL_NO_HW_AEP |
86 | ENGINE_load_aep(); | 86 | ENGINE_load_aep(); |
87 | #endif | 87 | #endif |
88 | #ifndef OPENSSL_NO_HW_ATALLA | ||
89 | ENGINE_load_atalla(); | ||
90 | #endif | ||
91 | #ifndef OPENSSL_NO_HW_NCIPHER | 88 | #ifndef OPENSSL_NO_HW_NCIPHER |
92 | ENGINE_load_chil(); | 89 | ENGINE_load_chil(); |
93 | #endif | 90 | #endif |
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index 289ac5cdac..948b5a18ff 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
@@ -334,7 +334,6 @@ void ENGINE_load_openssl(void); | |||
334 | void ENGINE_load_dynamic(void); | 334 | void ENGINE_load_dynamic(void); |
335 | #ifndef OPENSSL_NO_STATIC_ENGINE | 335 | #ifndef OPENSSL_NO_STATIC_ENGINE |
336 | void ENGINE_load_aep(void); | 336 | void ENGINE_load_aep(void); |
337 | void ENGINE_load_atalla(void); | ||
338 | void ENGINE_load_chil(void); | 337 | void ENGINE_load_chil(void); |
339 | void ENGINE_load_nuron(void); | 338 | void ENGINE_load_nuron(void); |
340 | void ENGINE_load_padlock(void); | 339 | void ENGINE_load_padlock(void); |