Remove the cswift engine: it is not standalone and we don't have the

hardware.

The vendor_defns/cswift.h does not specify a copyright and
theoretically defaults to the OpenSSL license, but it also mentions
that it includes parts that have been "clipped" from CryptoSwift's
proprietary headers.  This file should better include an explicit
copyright statement or mention OpenSSL's library instead of the
ambiguous "Attribution notice".

ok deraadt@

3 files changed, 0 insertions, 7 deletions

diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index 69143b75eb..ba36974c45 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -27,7 +27,6 @@ engine - ENGINE cryptographic module support
  void ENGINE_load_aep(void);
  void ENGINE_load_atalla(void);
  void ENGINE_load_chil(void);
- void ENGINE_load_cswift(void);
  void ENGINE_load_gmp(void);
  void ENGINE_load_nuron(void);
  #endif
@@ -319,8 +318,6 @@ functions, eg.
 
  /* Make the "dynamic" ENGINE available */
  void ENGINE_load_dynamic(void);
- /* Make the CryptoSwift hardware acceleration support available */
- void ENGINE_load_cswift(void);
  /* Make support for nCipher's "CHIL" hardware available */
  void ENGINE_load_chil(void);
  ...
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c
index cf7d631a58..f38a73773c 100644
--- a/src/lib/libcrypto/engine/eng_all.c
+++ b/src/lib/libcrypto/engine/eng_all.c
@@ -88,9 +88,6 @@ void ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_HW_ATALLA
         ENGINE_load_atalla();
 #endif
-#ifndef OPENSSL_NO_HW_CSWIFT
-        ENGINE_load_cswift();
-#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 56175d3f67..289ac5cdac 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -336,7 +336,6 @@ void ENGINE_load_dynamic(void);
 void ENGINE_load_aep(void);
 void ENGINE_load_atalla(void);
 void ENGINE_load_chil(void);
-void ENGINE_load_cswift(void);
 void ENGINE_load_nuron(void);
 void ENGINE_load_padlock(void);
 void ENGINE_load_capi(void);