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@

4 files changed, 0 insertions, 6 deletions

diff --git a/src/lib/libcrypto/doc/engine.pod b/src/lib/libcrypto/doc/engine.pod
index 3f4acce86d..0e1b72922c 100644
--- a/src/lib/libcrypto/doc/engine.pod
+++ b/src/lib/libcrypto/doc/engine.pod
@@ -31,7 +31,6 @@ engine - ENGINE cryptographic module support
  void ENGINE_load_gmp(void);
  void ENGINE_load_nuron(void);
  void ENGINE_load_sureware(void);
- void ENGINE_load_ubsec(void);
  #endif
  void ENGINE_load_cryptodev(void);
  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 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)
 #ifndef OPENSSL_NO_HW_SUREWARE
         ENGINE_load_sureware();
 #endif
-#ifndef OPENSSL_NO_HW_UBSEC
-        ENGINE_load_ubsec();
-#endif
 #ifndef OPENSSL_NO_HW_PADLOCK
         ENGINE_load_padlock();
 #endif
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index 85393f260d..445e28c941 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -339,7 +339,6 @@ void ENGINE_load_chil(void);
 void ENGINE_load_cswift(void);
 void ENGINE_load_nuron(void);
 void ENGINE_load_sureware(void);
-void ENGINE_load_ubsec(void);
 void ENGINE_load_padlock(void);
 void ENGINE_load_capi(void);
 #ifndef OPENSSL_NO_GMP
diff --git a/src/lib/libcrypto/util/libeay.num b/src/lib/libcrypto/util/libeay.num
index 39395014f3..ce05ae40a2 100644
--- a/src/lib/libcrypto/util/libeay.num
+++ b/src/lib/libcrypto/util/libeay.num
@@ -2071,7 +2071,6 @@ PKCS7_ATTR_SIGN_it                      2632	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTI
 UI_add_error_string                     2633    EXIST::FUNCTION:
 KRB5_CHECKSUM_free                      2634    EXIST::FUNCTION:
 OCSP_REQUEST_get_ext                    2635    EXIST::FUNCTION:
-ENGINE_load_ubsec                       2636    EXIST::FUNCTION:ENGINE,STATIC_ENGINE
 ENGINE_register_all_digests             2637    EXIST::FUNCTION:ENGINE
 PKEY_USAGE_PERIOD_it                    2638    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 PKEY_USAGE_PERIOD_it                    2638    EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: