Skip to contentSkip to conversation

package/alljoyn: use builtin crypto

PATCH New Bernd Kuhls 2 participants 2 messages Aug 18, 2018 – Aug 20, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 package/alljoyn: use builtin crypto

Support for OpenSSL 1.1 is broken, use builtin crypto for now like Debian does:

https://salsa.debian.org/debian-iot-team/alljoyn/alljoyn-core-1504/commit/09d9f916ecb3e0256c5b24ef46af28cdceb4ed1b#8756c63497c8dc39f7773438edf53b220c773f67_27_26

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/alljoyn/Config.in  | 1 -
 package/alljoyn/alljoyn.mk | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)
package/alljoyn/Config.in +0 -1
index 6eb417daf8..781d91bbe9 100644
@@ -7,7 +7,6 @@ config BR2_PACKAGE_ALLJOYN
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBCAP
-	select BR2_PACKAGE_OPENSSL
 	help
 	  The AllJoyn framework defines a common way for devices and
 	  apps to communicate with one another regardless of brands,
package/alljoyn/alljoyn.mk +2 -4
index 69d5dedc41..1281674e38 100644
@@ -11,11 +11,9 @@ ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV)
 # See https://allseenalliance.org/alliance/ip-policy
 ALLJOYN_LICENSE = ISC
 
-ALLJOYN_DEPENDENCIES = host-scons libcap openssl
+ALLJOYN_DEPENDENCIES = host-scons libcap
 ALLJOYN_INSTALL_STAGING = YES
 
-ALLJOYN_CRYPTO = openssl
-
 # AllJoyn can be compiled in debug or release mode. By default, AllJoyn is built
 # in debug mode.
 ALLJOYN_VARIANT = release

@@ -39,7 +37,7 @@ ALLJOYN_SCONS_OPTS = \
 	CPU=$(ALLJOYN_CPU) \
 	VARIANT=$(ALLJOYN_VARIANT) \
 	BR=off \
-	CRYPTO=$(ALLJOYN_CRYPTO) \
+	CRYPTO=builtin \
 	BINDINGS=$(ALLJOYN_BINDINGS) \
 	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
 	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
Signature · 1 line
2.18.0
Applied
#1 lore raw

PATCH 1/1 package/alljoyn: use builtin crypto

Hello,

Quoted 10 lines · Bernd Kuhls

Support for OpenSSL 1.1 is broken, use builtin crypto for now like Debian does:

https://salsa.debian.org/debian-iot-team/alljoyn/alljoyn-core-1504/commit/09d9f916ecb3e0256c5b24ef46af28cdceb4ed1b#8756c63497c8dc39f7773438edf53b220c773f67_27_26

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/alljoyn/Config.in  | 1 -
 package/alljoyn/alljoyn.mk | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

Hum, OK, but please revert to non-bundled once Alljoyn is fixed to build with OpenSSL 1.1.x.

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com