summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/engine
diff options
context:
space:
mode:
authorreyk <>2014-04-13 18:31:41 +0000
committerreyk <>2014-04-13 18:31:41 +0000
commit26de2d98da4c165037bbc9cf0bc0c9734760a865 (patch)
treed2fdaf6f2c0561c642436310ad835b2bdeaf061e /src/lib/libcrypto/engine
parente7e0fc2cfffbaa340a1810ec9e0fed524c372db5 (diff)
downloadopenbsd-26de2d98da4c165037bbc9cf0bc0c9734760a865.tar.gz
openbsd-26de2d98da4c165037bbc9cf0bc0c9734760a865.tar.bz2
openbsd-26de2d98da4c165037bbc9cf0bc0c9734760a865.zip
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@
Diffstat (limited to 'src/lib/libcrypto/engine')
-rw-r--r--src/lib/libcrypto/engine/eng_all.c3
-rw-r--r--src/lib/libcrypto/engine/engine.h1
2 files changed, 0 insertions, 4 deletions
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)
88#ifndef OPENSSL_NO_HW_ATALLA 88#ifndef OPENSSL_NO_HW_ATALLA
89 ENGINE_load_atalla(); 89 ENGINE_load_atalla();
90#endif 90#endif
91#ifndef OPENSSL_NO_HW_CSWIFT
92 ENGINE_load_cswift();
93#endif
94#ifndef OPENSSL_NO_HW_NCIPHER 91#ifndef OPENSSL_NO_HW_NCIPHER
95 ENGINE_load_chil(); 92 ENGINE_load_chil();
96#endif 93#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);
336void ENGINE_load_aep(void); 336void ENGINE_load_aep(void);
337void ENGINE_load_atalla(void); 337void ENGINE_load_atalla(void);
338void ENGINE_load_chil(void); 338void ENGINE_load_chil(void);
339void ENGINE_load_cswift(void);
340void ENGINE_load_nuron(void); 339void ENGINE_load_nuron(void);
341void ENGINE_load_padlock(void); 340void ENGINE_load_padlock(void);
342void ENGINE_load_capi(void); 341void ENGINE_load_capi(void);