summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto
diff options
context:
space:
mode:
authorreyk <>2014-04-13 19:04:55 +0000
committerreyk <>2014-04-13 19:04:55 +0000
commitda46bab8c0298f3edf0a0d6efc66fc7838b161e5 (patch)
treedf32de86d1bc3847a0bc6fb4954076071740d81d /src/lib/libcrypto
parent6851991ea11599a8a5923ff68d230d542d9185cd (diff)
downloadopenbsd-da46bab8c0298f3edf0a0d6efc66fc7838b161e5.tar.gz
openbsd-da46bab8c0298f3edf0a0d6efc66fc7838b161e5.tar.bz2
openbsd-da46bab8c0298f3edf0a0d6efc66fc7838b161e5.zip
Remove the AEP engine: it is not standalone and doesn't seem to be
relevant anymore. OpenSSL should have a better way to include 3rd party engines: either completely and 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.pod1
-rw-r--r--src/lib/libcrypto/engine/eng_all.c3
-rw-r--r--src/lib/libcrypto/engine/engine.h1
3 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index b0cea78cd3..1985924319 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -24,7 +24,6 @@ engine - ENGINE cryptographic module support
24 void ENGINE_load_openssl(void); 24 void ENGINE_load_openssl(void);
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);
28 void ENGINE_load_chil(void); 27 void ENGINE_load_chil(void);
29 void ENGINE_load_gmp(void); 28 void ENGINE_load_gmp(void);
30 void ENGINE_load_nuron(void); 29 void ENGINE_load_nuron(void);
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index 43fb3caf7d..6402afb6cb 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -82,9 +82,6 @@ void ENGINE_load_builtin_engines(void)
82 ENGINE_load_dynamic(); 82 ENGINE_load_dynamic();
83#ifndef OPENSSL_NO_STATIC_ENGINE 83#ifndef OPENSSL_NO_STATIC_ENGINE
84#ifndef OPENSSL_NO_HW 84#ifndef OPENSSL_NO_HW
85#ifndef OPENSSL_NO_HW_AEP
86 ENGINE_load_aep();
87#endif
88#ifndef OPENSSL_NO_HW_NCIPHER 85#ifndef OPENSSL_NO_HW_NCIPHER
89 ENGINE_load_chil(); 86 ENGINE_load_chil();
90#endif 87#endif
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 948b5a18ff..05e13578bd 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -333,7 +333,6 @@ ENGINE *ENGINE_by_id(const char *id);
333void ENGINE_load_openssl(void); 333void ENGINE_load_openssl(void);
334void ENGINE_load_dynamic(void); 334void ENGINE_load_dynamic(void);
335#ifndef OPENSSL_NO_STATIC_ENGINE 335#ifndef OPENSSL_NO_STATIC_ENGINE
336void ENGINE_load_aep(void);
337void ENGINE_load_chil(void); 336void ENGINE_load_chil(void);
338void ENGINE_load_nuron(void); 337void ENGINE_load_nuron(void);
339void ENGINE_load_padlock(void); 338void ENGINE_load_padlock(void);