From 42fd1dcb481bcbbf4cdefcb9b8545896f5b22049 Mon Sep 17 00:00:00 2001
From: reyk <>
Date: Sun, 13 Apr 2014 17:48:39 +0000
Subject: 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@
---
 src/lib/libcrypto/engine/eng_all.c | 3 ---
 src/lib/libcrypto/engine/engine.h  | 1 -
 2 files changed, 4 deletions(-)

(limited to 'src/lib/libcrypto/engine')

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
-- 
cgit v1.2.3-55-g6feb