diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-04-13 18:12:24 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2014-04-13 18:12:24 +0000 |
| commit | 8c8e2accd4f06e8a15f4d0932115c85493f98755 (patch) | |
| tree | 885c34209fecb4740b6778f78fb3c17dbf136dbf /lib/libcrypto | |
| parent | 39152a419c0abd23a8b118ede43103127a49b1ca (diff) | |
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 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/doc/engine.pod | 1 | ||||
| -rw-r--r-- | lib/libcrypto/engine/eng_all.c | 3 | ||||
| -rw-r--r-- | lib/libcrypto/engine/engine.h | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/lib/libcrypto/doc/engine.pod b/lib/libcrypto/doc/engine.pod index 0e1b72922c2..69143b75eb1 100644 --- a/lib/libcrypto/doc/engine.pod +++ b/lib/libcrypto/doc/engine.pod @@ -30,7 +30,6 @@ engine - ENGINE cryptographic module support void ENGINE_load_cswift(void); void ENGINE_load_gmp(void); void ENGINE_load_nuron(void); - void ENGINE_load_sureware(void); #endif void ENGINE_load_cryptodev(void); void ENGINE_load_builtin_engines(void); diff --git a/lib/libcrypto/engine/eng_all.c b/lib/libcrypto/engine/eng_all.c index c2d1a42729e..cf7d631a58c 100644 --- a/lib/libcrypto/engine/eng_all.c +++ b/lib/libcrypto/engine/eng_all.c @@ -97,9 +97,6 @@ void ENGINE_load_builtin_engines(void) #ifndef OPENSSL_NO_HW_NURON ENGINE_load_nuron(); #endif -#ifndef OPENSSL_NO_HW_SUREWARE - ENGINE_load_sureware(); -#endif #ifndef OPENSSL_NO_HW_PADLOCK ENGINE_load_padlock(); #endif diff --git a/lib/libcrypto/engine/engine.h b/lib/libcrypto/engine/engine.h index 445e28c941a..56175d3f672 100644 --- a/lib/libcrypto/engine/engine.h +++ b/lib/libcrypto/engine/engine.h @@ -338,7 +338,6 @@ void ENGINE_load_atalla(void); void ENGINE_load_chil(void); void ENGINE_load_cswift(void); void ENGINE_load_nuron(void); -void ENGINE_load_sureware(void); void ENGINE_load_padlock(void); void ENGINE_load_capi(void); #ifndef OPENSSL_NO_GMP |