99b681934d
- update dropbear to latest stable 2026.91; for the changes see https://matt.ucc.asn.au/dropbear/CHANGES - cherry-pick upstream patches: - sntrup: Fix 64-bit literals - Increase MAX_HOSTKEYS to 6 - Fix too-low pubkey key query count - automatically refresh patches Fixes: CVE-2019-6111, CVE-2026-35385 Signed-off-by: Konstantin Demin <rockdrilla@gmail.com> Link: https://github.com/openwrt/openwrt/pull/23217 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From b487b111d0cf735c640e6668aa888f7da4e78b3c Mon Sep 17 00:00:00 2001
|
|
From: Matt Johnston <matt@ucc.asn.au>
|
|
Date: Mon, 11 May 2026 20:43:50 +0800
|
|
Subject: sntrup: Fix 64-bit literals
|
|
|
|
Avoids warning on 32-bit platform
|
|
|
|
src/sntrup761.c:1643: warning: integer constant is too large for 'long' type
|
|
---
|
|
src/sntrup761.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/src/sntrup761.c
|
|
+++ b/src/sntrup761.c
|
|
@@ -1640,9 +1640,9 @@ __attribute__((unused))
|
|
static inline
|
|
int crypto_int64_ones_num(crypto_int64 crypto_int64_x) {
|
|
crypto_int64_unsigned crypto_int64_y = crypto_int64_x;
|
|
- const crypto_int64 C0 = 0x5555555555555555;
|
|
- const crypto_int64 C1 = 0x3333333333333333;
|
|
- const crypto_int64 C2 = 0x0f0f0f0f0f0f0f0f;
|
|
+ const crypto_int64 C0 = INT64_C(0x5555555555555555);
|
|
+ const crypto_int64 C1 = INT64_C(0x3333333333333333);
|
|
+ const crypto_int64 C2 = INT64_C(0x0f0f0f0f0f0f0f0f);
|
|
crypto_int64_y -= ((crypto_int64_y >> 1) & C0);
|
|
crypto_int64_y = (crypto_int64_y & C1) + ((crypto_int64_y >> 2) & C1);
|
|
crypto_int64_y = (crypto_int64_y + (crypto_int64_y >> 4)) & C2;
|