diff options
author | reyk <> | 2014-04-13 17:48:39 +0000 |
---|---|---|
committer | reyk <> | 2014-04-13 17:48:39 +0000 |
commit | 42fd1dcb481bcbbf4cdefcb9b8545896f5b22049 (patch) | |
tree | 9bdaa1e908478a524d891b9e8b40843370958f1e /src/lib/libcrypto/engine/eng_all.c | |
parent | 7aeb3e8167cb7d137c87f5f1d5c137a33ccd3925 (diff) | |
download | openbsd-42fd1dcb481bcbbf4cdefcb9b8545896f5b22049.tar.gz openbsd-42fd1dcb481bcbbf4cdefcb9b8545896f5b22049.tar.bz2 openbsd-42fd1dcb481bcbbf4cdefcb9b8545896f5b22049.zip |
Remove the Broadcom ubsec engine:
The vendor_defns/hw_ubsec.h file has a copyright that does not grant rights!
Vendor files should either include a compatible license in the
copyright statement or use OpenSSL's defaults, but adding a copyright
statement without any terms is not acceptable. It should not have
been included in the first place.
(The ubsec(4) kernel driver is not affected by this change)
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/engine/eng_all.c')
-rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c index 3f96605902..c2d1a42729 100644 --- a/src/lib/libcrypto/engine/eng_all.c +++ b/src/lib/libcrypto/engine/eng_all.c | |||
@@ -100,9 +100,6 @@ void ENGINE_load_builtin_engines(void) | |||
100 | #ifndef OPENSSL_NO_HW_SUREWARE | 100 | #ifndef OPENSSL_NO_HW_SUREWARE |
101 | ENGINE_load_sureware(); | 101 | ENGINE_load_sureware(); |
102 | #endif | 102 | #endif |
103 | #ifndef OPENSSL_NO_HW_UBSEC | ||
104 | ENGINE_load_ubsec(); | ||
105 | #endif | ||
106 | #ifndef OPENSSL_NO_HW_PADLOCK | 103 | #ifndef OPENSSL_NO_HW_PADLOCK |
107 | ENGINE_load_padlock(); | 104 | ENGINE_load_padlock(); |
108 | #endif | 105 | #endif |