From 3726269e789f788ea1d030d0cb9393c8e8a059ad Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Sat, 10 Jan 2026 20:58:48 +0100 Subject: [PATCH] libsodium: patch CVE-2025-69277 Pick patch per [1]. [1] https://nvd.nist.gov/vuln/detail/CVE-2025-69277 Signed-off-by: Peter Marko Signed-off-by: Khem Raj --- .../libsodium/libsodium/CVE-2025-69277.patch | 61 +++++++++++++++++++ .../libsodium/libsodium_1.0.20.bb | 2 + 2 files changed, 63 insertions(+) create mode 100644 meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch diff --git a/meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch b/meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch new file mode 100644 index 0000000000..a2ced62760 --- /dev/null +++ b/meta-oe/recipes-crypto/libsodium/libsodium/CVE-2025-69277.patch @@ -0,0 +1,61 @@ +From ad3004ec8731730e93fcfbbc824e67eadc1c1bae Mon Sep 17 00:00:00 2001 +From: Frank Denis +Date: Mon, 29 Dec 2025 23:22:15 +0100 +Subject: [PATCH] core_ed25519_is_valid_point: check Y==Z in addition to X==0 + +CVE: CVE-2025-69277 +Upstream-Status: Backport [https://github.com/jedisct1/libsodium/commit/ad3004ec8731730e93fcfbbc824e67eadc1c1bae] +Signed-off-by: Peter Marko +--- + src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c | 5 ++++- + test/default/core_ed25519.c | 7 ++++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c +index d3020132..4b824f6d 100644 +--- a/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c ++++ b/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c +@@ -1141,10 +1141,13 @@ int + ge25519_is_on_main_subgroup(const ge25519_p3 *p) + { + ge25519_p3 pl; ++ fe25519 t; + + ge25519_mul_l(&pl, p); + +- return fe25519_iszero(pl.X); ++ fe25519_sub(t, pl.Y, pl.Z); ++ ++ return fe25519_iszero(pl.X) & fe25519_iszero(t); + } + + int +diff --git a/test/default/core_ed25519.c b/test/default/core_ed25519.c +index bc457493..02f72bd6 100644 +--- a/test/default/core_ed25519.c ++++ b/test/default/core_ed25519.c +@@ -13,6 +13,10 @@ static const unsigned char max_canonical_p[32] = { + 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f + }; ++static const unsigned char not_main_subgroup_p[32] = { ++ 0x95, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, ++ 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99 ++}; + static const unsigned char L_p1[32] = { + 0xee, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10 +@@ -133,11 +137,12 @@ main(void) + assert(crypto_core_ed25519_is_valid_point(p) == 0); + + p[0] = 9; +- assert(crypto_core_ed25519_is_valid_point(p) == 1); ++ assert(crypto_core_ed25519_is_valid_point(p) == 0); + + assert(crypto_core_ed25519_is_valid_point(max_canonical_p) == 1); + assert(crypto_core_ed25519_is_valid_point(non_canonical_invalid_p) == 0); + assert(crypto_core_ed25519_is_valid_point(non_canonical_p) == 0); ++ assert(crypto_core_ed25519_is_valid_point(not_main_subgroup_p) == 0); + + memcpy(p2, p, crypto_core_ed25519_BYTES); + add_P(p2); diff --git a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb index 63d21576b4..972b8b8694 100644 --- a/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb +++ b/meta-oe/recipes-crypto/libsodium/libsodium_1.0.20.bb @@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c59be7bb29f8e431b5f2d690b6734185" SRC_URI = "https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz" SRC_URI[sha256sum] = "ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19" +SRC_URI += "file://CVE-2025-69277.patch" + inherit autotools BBCLASSEXTEND = "native nativesdk"