summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2014-04-13 18:31:42 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2014-04-13 18:31:42 +0000
commitb3b38e3d620f2bce6e56cfebd4d1182885d17cec (patch)
tree8b2802cbd8c631833d5946b17af6b5ed1748dfc4
parent8c8e2accd4f06e8a15f4d0932115c85493f98755 (diff)
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@
-rw-r--r--lib/libcrypto/doc/engine.pod3
-rw-r--r--lib/libcrypto/engine/eng_all.c3
-rw-r--r--lib/libcrypto/engine/engine.h1
3 files changed, 0 insertions, 7 deletions
diff --git a/lib/libcrypto/doc/engine.pod b/lib/libcrypto/doc/engine.pod
index 69143b75eb1..ba36974c457 100644
--- a/lib/libcrypto/doc/engine.pod
+++ b/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/lib/libcrypto/engine/eng_all.c b/lib/libcrypto/engine/eng_all.c
index cf7d631a58c..f38a73773cc 100644
--- a/lib/libcrypto/engine/eng_all.c
+++ b/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/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h
index 56175d3f672..289ac5cdac2 100644
--- a/lib/libcrypto/engine/engine.h
+++ b/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);