On Mon, Feb 17 2020 at 10:39 +0100, Michael Olbrich <m.olbr...@pengutronix.de> wrote: > On Wed, Feb 05, 2020 at 11:42:39AM +0100, Ulrich Ölmann wrote: >> From: Björn Esser <b.es...@pengutronix.de> >> >> mbed TLS (formerly known as PolarSSL) makes it trivially easy >> for developers to include cryptographic and SSL/TLS capabilities >> in their (embedded) products, facilitating this functionality >> with a minimal coding footprint. >> >> Unfortunately the upcoming open62541 package cannot be built >> against OpenSSL. To enable its SSL functionality mbed TLS is >> needed. >> >> Signed-off-by: Björn Esser <b.es...@pengutronix.de> >> [uol: adjusted commit message] >> Signed-off-by: Ulrich Ölmann <u.oelm...@pengutronix.de> >> --- >> v2 --> v3: adjusted commit message > > Not your fault, but needs to be fixed: > > libssh2 now uses /usr/lib/libmbedcrypto.so.3 without depending on it :-/
Fixed in the next iteration of the series (to be sent in a few minutes) by a version bump to a fixed release of libssh2. Best regards Ulrich > Michael > >> >> rules/mbedtls.in | 13 +++++++++ >> rules/mbedtls.make | 66 ++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 79 insertions(+) >> create mode 100644 rules/mbedtls.in >> create mode 100644 rules/mbedtls.make >> >> diff --git a/rules/mbedtls.in b/rules/mbedtls.in >> new file mode 100644 >> index 000000000000..a0d58dbd5468 >> --- /dev/null >> +++ b/rules/mbedtls.in >> @@ -0,0 +1,13 @@ >> +## SECTION=system_libraries >> + >> +config MBEDTLS >> + tristate >> + prompt "mbedtls" >> + select HOST_CMAKE >> + select LIBC_PTHREAD >> + select ZLIB >> + help >> + mbed TLS (formerly known as PolarSSL) makes it trivially easy >> + for developers to include cryptographic and SSL/TLS capabilities >> + in their (embedded) products, facilitating this functionality >> + with a minimal coding footprint. >> diff --git a/rules/mbedtls.make b/rules/mbedtls.make >> new file mode 100644 >> index 000000000000..0086492fc029 >> --- /dev/null >> +++ b/rules/mbedtls.make >> @@ -0,0 +1,66 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2019 by Bjoern Esser <b...@pengutronix.de> >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +# >> +# We provide this package >> +# >> +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls >> + >> +# >> +# Paths and names >> +# >> +MBEDTLS_VERSION := 2.16.3 >> +MBEDTLS_MD5 := 90ce7c7a001d2514410280706b3ab1a7 >> +MBEDTLS := mbedtls-$(MBEDTLS_VERSION) >> +MBEDTLS_SUFFIX := tgz >> +MBEDTLS_URL := >> https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) >> +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) >> +MBEDTLS_DIR := $(BUILDDIR)/$(MBEDTLS) >> +MBEDTLS_LICENSE := Apache-2.0 >> +MBEDTLS_LICENSE_FILES := >> file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 >> + >> +# >> ---------------------------------------------------------------------------- >> +# Prepare >> +# >> ---------------------------------------------------------------------------- >> + >> +# >> +# cmake >> +# >> +MBEDTLS_CONF_TOOL := cmake >> +MBEDTLS_CONF_OPT := \ >> + $(CROSS_CMAKE_USR) \ >> + -DENABLE_PROGRAMS=OFF \ >> + -DENABLE_TESTING=OFF \ >> + -DENABLE_ZLIB_SUPPORT=ON \ >> + -DINSTALL_MBEDTLS_HEADERS=ON \ >> + -DLINK_WITH_PTHREAD=ON \ >> + -DUNSAFE_BUILD=OFF \ >> + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ >> + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ >> + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF >> + >> +# >> ---------------------------------------------------------------------------- >> +# Target-Install >> +# >> ---------------------------------------------------------------------------- >> + >> +$(STATEDIR)/mbedtls.targetinstall: >> + @$(call targetinfo) >> + >> + @$(call install_init, mbedtls) >> + @$(call install_fixup, mbedtls,PRIORITY,optional) >> + @$(call install_fixup, mbedtls,SECTION,base) >> + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser >> <b...@pengutronix.de>") >> + @$(call install_fixup, mbedtls,DESCRIPTION,missing) >> + >> + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) >> + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) >> + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) >> + >> + @$(call install_finish, mbedtls) >> + >> + @$(call touch) >> -- >> 2.25.0 >> >> >> _______________________________________________ >> ptxdist mailing list >> ptxdist@pengutronix.de -- Pengutronix e.K. | Ulrich Ölmann | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de