From 559cbe68580b0887f866a31a1a3c317ec21eade2 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Sun, 13 Apr 2014 19:04:55 +0000
Subject: 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@
---
 src/lib/libcrypto/doc/engine.pod   | 1 -
 src/lib/libcrypto/engine/eng_all.c | 3 ---
 src/lib/libcrypto/engine/engine.h  | 1 -
 3 files changed, 5 deletions(-)

(limited to 'src/lib/libcrypto')

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
  void ENGINE_load_openssl(void);
  void ENGINE_load_dynamic(void);
  #ifndef OPENSSL_NO_STATIC_ENGINE
- void ENGINE_load_aep(void);
  void ENGINE_load_chil(void);
  void ENGINE_load_gmp(void);
  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)
 	ENGINE_load_dynamic();
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
-#ifndef OPENSSL_NO_HW_AEP
-	ENGINE_load_aep();
-#endif
 #ifndef OPENSSL_NO_HW_NCIPHER
 	ENGINE_load_chil();
 #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);
 void ENGINE_load_openssl(void);
 void ENGINE_load_dynamic(void);
 #ifndef OPENSSL_NO_STATIC_ENGINE
-void ENGINE_load_aep(void);
 void ENGINE_load_chil(void);
 void ENGINE_load_nuron(void);
 void ENGINE_load_padlock(void);
-- 
cgit v1.2.3-55-g6feb