diff options
author | reyk <> | 2014-04-13 18:12:23 +0000 |
---|---|---|
committer | reyk <> | 2014-04-13 18:12:23 +0000 |
commit | e7e0fc2cfffbaa340a1810ec9e0fed524c372db5 (patch) | |
tree | 27fa3287596037cbc0ca3494db096362bd8a5079 /src/lib/libcrypto | |
parent | 42fd1dcb481bcbbf4cdefcb9b8545896f5b22049 (diff) | |
download | openbsd-e7e0fc2cfffbaa340a1810ec9e0fed524c372db5.tar.gz openbsd-e7e0fc2cfffbaa340a1810ec9e0fed524c372db5.tar.bz2 openbsd-e7e0fc2cfffbaa340a1810ec9e0fed524c372db5.zip |
Remove the "sureware" engine:
The vendor_defns/sureware.h file by Baltimore Technologies Ltd. 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.
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto')
-rw-r--r-- | src/lib/libcrypto/doc/engine.pod | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/engine.h | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod index 0e1b72922c..69143b75eb 100644 --- a/src/lib/libcrypto/doc/engine.pod +++ b/src/lib/libcrypto/doc/engine.pod | |||
@@ -30,7 +30,6 @@ engine - ENGINE cryptographic module support | |||
30 | void ENGINE_load_cswift(void); | 30 | void ENGINE_load_cswift(void); |
31 | void ENGINE_load_gmp(void); | 31 | void ENGINE_load_gmp(void); |
32 | void ENGINE_load_nuron(void); | 32 | void ENGINE_load_nuron(void); |
33 | void ENGINE_load_sureware(void); | ||
34 | #endif | 33 | #endif |
35 | void ENGINE_load_cryptodev(void); | 34 | void ENGINE_load_cryptodev(void); |
36 | void ENGINE_load_builtin_engines(void); | 35 | void ENGINE_load_builtin_engines(void); |
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c index c2d1a42729..cf7d631a58 100644 --- a/src/lib/libcrypto/engine/eng_all.c +++ b/src/lib/libcrypto/engine/eng_all.c | |||
@@ -97,9 +97,6 @@ void ENGINE_load_builtin_engines(void) | |||
97 | #ifndef OPENSSL_NO_HW_NURON | 97 | #ifndef OPENSSL_NO_HW_NURON |
98 | ENGINE_load_nuron(); | 98 | ENGINE_load_nuron(); |
99 | #endif | 99 | #endif |
100 | #ifndef OPENSSL_NO_HW_SUREWARE | ||
101 | ENGINE_load_sureware(); | ||
102 | #endif | ||
103 | #ifndef OPENSSL_NO_HW_PADLOCK | 100 | #ifndef OPENSSL_NO_HW_PADLOCK |
104 | ENGINE_load_padlock(); | 101 | ENGINE_load_padlock(); |
105 | #endif | 102 | #endif |
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h index 445e28c941..56175d3f67 100644 --- a/src/lib/libcrypto/engine/engine.h +++ b/src/lib/libcrypto/engine/engine.h | |||
@@ -338,7 +338,6 @@ void ENGINE_load_atalla(void); | |||
338 | void ENGINE_load_chil(void); | 338 | void ENGINE_load_chil(void); |
339 | void ENGINE_load_cswift(void); | 339 | void ENGINE_load_cswift(void); |
340 | void ENGINE_load_nuron(void); | 340 | void ENGINE_load_nuron(void); |
341 | void ENGINE_load_sureware(void); | ||
342 | void ENGINE_load_padlock(void); | 341 | void ENGINE_load_padlock(void); |
343 | void ENGINE_load_capi(void); | 342 | void ENGINE_load_capi(void); |
344 | #ifndef OPENSSL_NO_GMP | 343 | #ifndef OPENSSL_NO_GMP |