Re: [OE-core] [PATCH 06/33] dropbear: upgrade 2022.83 -> 2024.84

[Alexandre Belloni <alexandre.belloni@bootlin.com>]

ERROR: dropbear-2024.84-r0 do_patch: Applying patch '0005-dropbear-enable-pam.patch' on target directory '/home/pokybuild/yocto-worker/beaglebone-alt/build/build/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/dropbear/2024.84/dropbear-2024.84'
CmdError('quilt --quiltrc /home/pokybuild/yocto-worker/beaglebone-alt/build/build/tmp/work/cortexa8hf-neon-poky-linux-gnueabi/dropbear/2024.84/recipe-sysroot-native/etc/quiltrc push', 0, "stdout: Applying patch 0005-dropbear-enable-pam.patch
can't find file to patch at input line 21
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From b8cece92ba19aa77ac013ea161bfe4c7147747c9 Mon Sep 17 00:00:00 2001
|From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|Date: Wed, 2 Dec 2015 11:36:02 +0200
|Subject: Enable pam
|
|We need modify file default_options.h besides enabling pam in
|configure if we want dropbear to support pam.
|
|Upstream-Status: Pending
|
|Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
|Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|---
| default_options.h | 4 ++--
| 1 file changed, 2 insertions(+), 2 deletions(-)
|
|diff --git a/default_options.h b/default_options.h
|index 0e3d027..349338c 100644
|--- a/default_options.h
|+++ b/default_options.h
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
Patch 0005-dropbear-enable-pam.patch does not apply (enforce with -f)
stderr: ")


On 09/04/2024 15:09:53+0800, wangmy via lists.openembedded.org wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> 0001-urandom-xauth-changes-to-options.h.patch
> dropbear-disable-weak-ciphers.patch
> refreshed for 2024.84
> 
> CVE-2023-36328.patch
> removed since it's included in 2024.84
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...1-urandom-xauth-changes-to-options.h.patch |  14 +-
>  .../dropbear/dropbear/CVE-2023-36328.patch    | 144 ------------------
>  .../dropbear-disable-weak-ciphers.patch       |   6 +-
>  ...ropbear_2022.83.bb => dropbear_2024.84.bb} |   3 +-
>  4 files changed, 11 insertions(+), 156 deletions(-)
>  delete mode 100644 meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch
>  rename meta/recipes-core/dropbear/{dropbear_2022.83.bb => dropbear_2024.84.bb} (97%)
> 
> diff --git a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
> index 99adcfd770..c74f09e484 100644
> --- a/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
> +++ b/meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
> @@ -2,14 +2,14 @@ Subject: [PATCH 1/6] urandom-xauth-changes-to-options.h
>  
>  Upstream-Status: Inappropriate [configuration]
>  ---
> - default_options.h | 2 +-
> + src/default_options.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
> -diff --git a/default_options.h b/default_options.h
> -index 349338c..5ffac25 100644
> ---- a/default_options.h
> -+++ b/default_options.h
> -@@ -289,7 +289,7 @@ group1 in Dropbear server too */
> +diff --git a/src/default_options.h b/src/default_options.h
> +index 6e970bb..ccc8b47 100644
> +--- a/src/default_options.h
> ++++ b/src/default_options.h
> +@@ -311,7 +311,7 @@ group1 in Dropbear server too */
>   
>   /* The command to invoke for xauth when using X11 forwarding.
>    * "-q" for quiet */
> @@ -19,5 +19,5 @@ index 349338c..5ffac25 100644
>   
>   /* If you want to enable running an sftp server (such as the one included with
>  -- 
> -2.25.1
> +2.34.1
>  
> diff --git a/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch b/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch
> deleted file mode 100644
> index ec50d69816..0000000000
> --- a/meta/recipes-core/dropbear/dropbear/CVE-2023-36328.patch
> +++ /dev/null
> @@ -1,144 +0,0 @@
> -From beba892bc0d4e4ded4d667ab1d2a94f4d75109a9 Mon Sep 17 00:00:00 2001
> -From: czurnieden <czurnieden@gmx.de>
> -Date: Fri, 8 Sep 2023 10:07:32 +0000
> -Subject: [PATCH] Fix possible integer overflow
> -
> -CVE: CVE-2023-36328
> -
> -Upstream-Status: Backport [https://github.com/libtom/libtommath/commit/beba892bc0d4e4ded4d667ab1d2a94f4d75109a9]
> -
> -Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
> ----
> - libtommath/bn_mp_2expt.c                | 4 ++++
> - libtommath/bn_mp_grow.c                 | 4 ++++
> - libtommath/bn_mp_init_size.c            | 5 +++++
> - libtommath/bn_mp_mul_2d.c               | 4 ++++
> - libtommath/bn_s_mp_mul_digs.c           | 4 ++++
> - libtommath/bn_s_mp_mul_digs_fast.c      | 4 ++++
> - libtommath/bn_s_mp_mul_high_digs.c      | 4 ++++
> - libtommath/bn_s_mp_mul_high_digs_fast.c | 4 ++++
> - 8 files changed, 33 insertions(+)
> -
> -diff --git a/libtommath/bn_mp_2expt.c b/libtommath/bn_mp_2expt.c
> -index 0ae3df1..ca6fbc3 100644
> ---- a/libtommath/bn_mp_2expt.c
> -+++ b/libtommath/bn_mp_2expt.c
> -@@ -12,6 +12,10 @@ mp_err mp_2expt(mp_int *a, int b)
> - {
> -    mp_err    err;
> -
> -+   if (b < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* zero a as per default */
> -    mp_zero(a);
> -
> -diff --git a/libtommath/bn_mp_grow.c b/libtommath/bn_mp_grow.c
> -index 9e904c5..2b16826 100644
> ---- a/libtommath/bn_mp_grow.c
> -+++ b/libtommath/bn_mp_grow.c
> -@@ -9,6 +9,10 @@ mp_err mp_grow(mp_int *a, int size)
> -    int     i;
> -    mp_digit *tmp;
> -
> -+   if (size < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* if the alloc size is smaller alloc more ram */
> -    if (a->alloc < size) {
> -       /* reallocate the array a->dp
> -diff --git a/libtommath/bn_mp_init_size.c b/libtommath/bn_mp_init_size.c
> -index d622687..5fefa96 100644
> ---- a/libtommath/bn_mp_init_size.c
> -+++ b/libtommath/bn_mp_init_size.c
> -@@ -6,6 +6,11 @@
> - /* init an mp_init for a given size */
> - mp_err mp_init_size(mp_int *a, int size)
> - {
> -+
> -+   if (size < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    size = MP_MAX(MP_MIN_PREC, size);
> -
> -    /* alloc mem */
> -diff --git a/libtommath/bn_mp_mul_2d.c b/libtommath/bn_mp_mul_2d.c
> -index 87354de..2744163 100644
> ---- a/libtommath/bn_mp_mul_2d.c
> -+++ b/libtommath/bn_mp_mul_2d.c
> -@@ -9,6 +9,10 @@ mp_err mp_mul_2d(const mp_int *a, int b, mp_int *c)
> -    mp_digit d;
> -    mp_err   err;
> -
> -+   if (b < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* copy */
> -    if (a != c) {
> -       if ((err = mp_copy(a, c)) != MP_OKAY) {
> -diff --git a/libtommath/bn_s_mp_mul_digs.c b/libtommath/bn_s_mp_mul_digs.c
> -index 64509d4..2d2f5b0 100644
> ---- a/libtommath/bn_s_mp_mul_digs.c
> -+++ b/libtommath/bn_s_mp_mul_digs.c
> -@@ -16,6 +16,10 @@ mp_err s_mp_mul_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
> -    mp_word r;
> -    mp_digit tmpx, *tmpt, *tmpy;
> -
> -+   if (digs < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* can we use the fast multiplier? */
> -    if ((digs < MP_WARRAY) &&
> -        (MP_MIN(a->used, b->used) < MP_MAXFAST)) {
> -diff --git a/libtommath/bn_s_mp_mul_digs_fast.c b/libtommath/bn_s_mp_mul_digs_fast.c
> -index b2a287b..d6dd3cc 100644
> ---- a/libtommath/bn_s_mp_mul_digs_fast.c
> -+++ b/libtommath/bn_s_mp_mul_digs_fast.c
> -@@ -26,6 +26,10 @@ mp_err s_mp_mul_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int digs)
> -    mp_digit W[MP_WARRAY];
> -    mp_word  _W;
> -
> -+   if (digs < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* grow the destination as required */
> -    if (c->alloc < digs) {
> -       if ((err = mp_grow(c, digs)) != MP_OKAY) {
> -diff --git a/libtommath/bn_s_mp_mul_high_digs.c b/libtommath/bn_s_mp_mul_high_digs.c
> -index 2bb2a50..c9dd355 100644
> ---- a/libtommath/bn_s_mp_mul_high_digs.c
> -+++ b/libtommath/bn_s_mp_mul_high_digs.c
> -@@ -15,6 +15,10 @@ mp_err s_mp_mul_high_digs(const mp_int *a, const mp_int *b, mp_int *c, int digs)
> -    mp_word  r;
> -    mp_digit tmpx, *tmpt, *tmpy;
> -
> -+   if (digs < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* can we use the fast multiplier? */
> -    if (MP_HAS(S_MP_MUL_HIGH_DIGS_FAST)
> -        && ((a->used + b->used + 1) < MP_WARRAY)
> -diff --git a/libtommath/bn_s_mp_mul_high_digs_fast.c b/libtommath/bn_s_mp_mul_high_digs_fast.c
> -index a2c4fb6..afe3e4b 100644
> ---- a/libtommath/bn_s_mp_mul_high_digs_fast.c
> -+++ b/libtommath/bn_s_mp_mul_high_digs_fast.c
> -@@ -19,6 +19,10 @@ mp_err s_mp_mul_high_digs_fast(const mp_int *a, const mp_int *b, mp_int *c, int
> -    mp_digit W[MP_WARRAY];
> -    mp_word  _W;
> -
> -+   if (digs < 0) {
> -+      return MP_VAL;
> -+   }
> -+
> -    /* grow the destination as required */
> -    pa = a->used + b->used;
> -    if (c->alloc < pa) {
> ---
> -2.35.5
> diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
> index 5c60868ed8..03b452ee0a 100644
> --- a/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
> +++ b/meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
> @@ -13,10 +13,10 @@ Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com>
>   default_options.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>  
> -diff --git a/default_options.h b/default_options.h
> +diff --git a/src/default_options.h b/src/default_options.h
>  index d417588..bc5200f 100644
> ---- a/default_options.h
> -+++ b/default_options.h
> +--- a/src/default_options.h
> ++++ b/src/default_options.h
>  @@ -180,7 +180,7 @@ IMPORTANT: Some options will require "make clean" after changes */
>    * Small systems should generally include either curve25519 or ecdh for performance.
>    * curve25519 is less widely supported but is faster
> diff --git a/meta/recipes-core/dropbear/dropbear_2022.83.bb b/meta/recipes-core/dropbear/dropbear_2024.84.bb
> similarity index 97%
> rename from meta/recipes-core/dropbear/dropbear_2022.83.bb
> rename to meta/recipes-core/dropbear/dropbear_2024.84.bb
> index 528eff1a10..69c7b04c55 100644
> --- a/meta/recipes-core/dropbear/dropbear_2022.83.bb
> +++ b/meta/recipes-core/dropbear/dropbear_2024.84.bb
> @@ -21,10 +21,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
>             file://dropbear.default \
>             ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
>             ${@bb.utils.contains('PACKAGECONFIG', 'disable-weak-ciphers', 'file://dropbear-disable-weak-ciphers.patch', '', d)} \
> -           file://CVE-2023-36328.patch \
>             "
>  
> -SRC_URI[sha256sum] = "bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b"
> +SRC_URI[sha256sum] = "16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009"
>  
>  PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
>                 file://0006-dropbear-configuration-file.patch \
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#198028): https://lists.openembedded.org/g/openembedded-core/message/198028
> Mute This Topic: https://lists.openembedded.org/mt/105417634/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com