libtommath: add recipe for LibTomMath used by dropbear
PATCH v3 1/3 libtommath: add recipe for LibTomMath used by dropbear
* When system-libtom PACKAGECONFIG is used, both libtomcrypt and libtommath are used from system and we need a recipes for both.
* libtomcrypt was already added to meta-oe in langdale and PACKAGECONFIG was added in dropbear in:
https://git.openembedded.org/openembedded-core/commit/?id=b7c2edd2d6ded287d8b34dd047ae84d3fd69d4c6
---
v3: add libtool-cross dependency to fix cross compilation (dunfell needs LIBTOOL
to be set in EXTRA_OEMAKE because of ${HOST_SYS} prefix), but the dependency is needed for all releases when cross compiling
.../libtommath/libtommath_1.2.0.bb | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta-oe/recipes-support/libtommath/libtommath_1.2.0.bb
meta-oe/recipes-support/libtommath/libtommath_1.2.0.bb new file +23 -0
@@ -0,0 +1,23 @@ +SUMMARY = "LibTomMath is a number theoretic multiple-precision integer library" +HOMEPAGE = "https://www.libtom.net/LibTomMath" +SECTION = "libs" +LICENSE = "Unlicense" +LIC_FILES_CHKSUM = "file://LICENSE;md5=23e7e0a32e53a2b1d35f5fd9ef053402" + +DEPENDS = "libtool-cross" + +SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master" + +SRCREV = "6ca6898bf37f583c4cc9943441cd60dd69f4b8f2" + +S = "${WORKDIR}/git" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + +do_compile() { + oe_runmake -f makefile.shared +} + +do_install() { + oe_runmake -f makefile.shared install +}
PATCH v3 2/3 libtomcrypt: backport a fix for CVE-2019-17362
---
v3: no change, just to send v3 of whole series
.../libtomcrypt/CVE-2019-17362.patch | 25 +++++++++++++++++++ .../libtomcrypt/libtomcrypt_1.18.2.bb | 4 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-crypto/libtomcrypt/libtomcrypt/CVE-2019-17362.patch
meta-oe/recipes-crypto/libtomcrypt/libtomcrypt/CVE-2019-17362.patch new file +25 -0
@@ -0,0 +1,25 @@ +From 25c26a3b7a9ad8192ccc923e15cf62bf0108ef94 Mon Sep 17 00:00:00 2001 +From: werew <[email protected]> +Date: Thu, 3 Oct 2019 19:57:10 +0200 +Subject: [PATCH] Fixes #507 + +Signed-off-by: Martin Jansa <[email protected]> +--- +Upstream-Status: Backport [https://github.com/libtom/libtomcrypt/commit/64d1153e5a515740ab56f39c46baf4cf6991a9d3] + + src/pk/asn1/der/utf8/der_decode_utf8_string.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pk/asn1/der/utf8/der_decode_utf8_string.c b/src/pk/asn1/der/utf8/der_decode_utf8_string.c +index 94555b99f..d3ed82bea 100644 +--- a/src/pk/asn1/der/utf8/der_decode_utf8_string.c ++++ b/src/pk/asn1/der/utf8/der_decode_utf8_string.c +@@ -65,7 +65,7 @@ int der_decode_utf8_string(const unsigned char *in, unsigned long inlen, + /* count number of bytes */ + for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF); + +- if (z > 4 || (x + (z - 1) > inlen)) { ++ if (z == 1 || z > 4 || (x + (z - 1) > inlen)) { + return CRYPT_INVALID_PACKET; + } +
meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb +3 -1
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71baacc459522324ef3e2b9e052e8180" DEPENDS += "libtool-cross" -SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master" +SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master \ + file://CVE-2019-17362.patch \ +" SRCREV = "7e7eb695d581782f04b24dc444cbfde86af59853"
PATCH v3 3/3 libtomcrypt: add PACKAGECONFIG for ltm enabled by default
In reply to Martin Jansa* enabled by default, because that's what dropbear expects and fails without as shown in:
http://errors.yoctoproject.org/Errors/Details/720460/
dropbear/2022.83-r0/crypto_desc.c:72: undefined reference to `ltm_desc'
* add comment about the LICENSE
* use EXTRA_OEMAKE
* FYI: if you need to use this in dunfell (for whatever reason e.g. to avoid CVE-2019-17362 in dropbear which contains bundled libtomcrypt), then you need to add:
# Only needed for dunfell, fixed in kirkstone with: # https://git.openembedded.org/openembedded-core/commit/?h=kirkstone&id=4b308773eca7570ce5007e8f953b56252c17fdb1 DEPENDS += "libtool-cross" EXTRA_OEMAKE += "'LIBTOOL=${HOST_SYS}-libtool'"
---
v3: add libtool-cross dependency to fix cross compilation (dunfell needs LIBTOOL
to be set in EXTRA_OEMAKE because of ${HOST_SYS} prefix), but the dependency is needed for all releases when cross compiling
.../libtomcrypt/libtomcrypt_1.18.2.bb | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
meta-oe/recipes-crypto/libtomcrypt/libtomcrypt_1.18.2.bb +20 -2
@@ -1,10 +1,19 @@ SUMMARY = "LibTomCrypt is a public domain open source cryptographic toolkit" HOMEPAGE = "https://www.libtom.net/LibTomCrypt" SECTION = "libs" +# Unlicense isn't very accurate for this revision, it was WTFPL in 0.18.0-rc1: +# https://github.com/libtom/libtomcrypt/commit/77e31fb6a980212e90b9a50f116dc5a7bd91e527 +# then updated to dual license PD and WTFPL also in 0.18.0-rc1: +# https://github.com/libtom/libtomcrypt/commit/412b2ee1fccc3a0df58f93f372c90d6d0f93bfc9 +# and then updated again to Unlicense after the 0.18.2 tag (it's only in develop branch): +# https://github.com/libtom/libtomcrypt/commit/3630bee6fc0f73dd9c7923fd43f8ae15a2c0fb70 +# but keep using Unlicense to avoid triggering people with WTFPL license: +# https://groups.google.com/g/libtom/c/17Z7xkECULM +# and this comment can be removed next time libtomcrypt is updated LICENSE = "Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=71baacc459522324ef3e2b9e052e8180" -DEPENDS += "libtool-cross" +DEPENDS = "libtool-cross" SRC_URI = "git://github.com/libtom/libtomcrypt.git;protocol=https;branch=master \ file://CVE-2019-17362.patch \
@@ -14,10 +23,19 @@ SRCREV = "7e7eb695d581782f04b24dc444cbfde86af59853" S = "${WORKDIR}/git" +inherit pkgconfig + +PACKAGECONFIG ??= "ltm" +PACKAGECONFIG[ltm] = ",,libtommath" + +CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'ltm', '-DUSE_LTM -DLTM_DESC', '', d)}" + +EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" + do_compile() { oe_runmake -f makefile.shared } do_install() { - oe_runmake -f makefile.shared 'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' install + oe_runmake -f makefile.shared install }