dropbear: 2022.82

[LeSpocky]

See full changelog for details.

[LeSpocky]

https://lore.kernel.org/buildroot/05c2ec866042ea7dd9a215c76c6382f2096199ab.1650274250.git.baruch@tkos.co.il/

[LeSpocky]

This is the obvious change:

 rules/dropbear.in   | 22 ----------------------
 rules/dropbear.make | 20 ++------------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/rules/dropbear.in b/rules/dropbear.in
index 1b654917..81e9c38f 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -171,28 +171,6 @@ config DROPBEAR_AES256
      (and others) to protect sensitive information.

-config DROPBEAR_TWOFISH128
-   bool
-   prompt "Twofish128"
-   help
-     Another great algorithm designed by Bruce Schneier.
-     This block cipher was designed as a successor to
-     the 64-bit Blowfish block cipher.
-     Twofish combines a 16-round Feistel network with a
-     bijective f function made by four key-dependent
-     8x8-bit S-boxes.
-
-config DROPBEAR_TWOFISH256
-   bool
-   prompt "Twofish256"
-   help
-     Another great algorithm designed by Bruce Schneier.
-     This block cipher was designed as a successor to
-     the 64-bit Blowfish block cipher.
-     Twofish combines a 16-round Feistel network with a
-     bijective f function made by four key-dependent
-     8x8-bit S-boxes.
-
 config DROPBEAR_CBC_CIPHERS
    bool
    prompt "CBC mode ciphers"
diff --git a/rules/dropbear.make b/rules/dropbear.make
index b91fde7c..720de325 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
 #
 # Paths and names
 #
-DROPBEAR_VERSION   := 2020.81
-DROPBEAR_MD5       := a07438a6159a24c61f98f1bce2d479c0
+DROPBEAR_VERSION   := 2022.82
+DROPBEAR_MD5       := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
 DROPBEAR       := dropbear-$(DROPBEAR_VERSION)
 DROPBEAR_SUFFIX        := tar.bz2
 DROPBEAR_URL       := http://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
@@ -126,22 +126,6 @@ else
    @echo "#define DROPBEAR_AES256 0" >> $(DROPBEAR_LOCALOPTIONS)
 endif

-ifdef PTXCONF_DROPBEAR_TWOFISH256
-   @echo "ptxdist: enabling twofish256"
-   @echo "#define DROPBEAR_TWOFISH256 1" >> $(DROPBEAR_LOCALOPTIONS)
-else
-   @echo "ptxdist: disabling twofish256"
-   @echo "#define DROPBEAR_TWOFISH256 0" >> $(DROPBEAR_LOCALOPTIONS)
-endif
-
-ifdef PTXCONF_DROPBEAR_TWOFISH128
-   @echo "ptxdist: enabling twofish128"
-   @echo "#define DROPBEAR_TWOFISH128 1" >> $(DROPBEAR_LOCALOPTIONS)
-else
-   @echo "ptxdist: disabling twofish128"
-   @echo "#define DROPBEAR_TWOFISH128 0" >> $(DROPBEAR_LOCALOPTIONS)
-endif
-
 # ciphers
 ifdef PTXCONF_DROPBEAR_CBC_CIPHERS
    @echo "ptxdist: enabling cbc ciphers"

However build fails like this:

arm-v5te-linux-gnueabi-gcc -c -Os -W -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2  -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I. -DDROPBEAR_SERVER -DDROPBEAR_CLIENT signkey.c -o signkey.o
In file included from signkey.c:31:0:
sk-ecdsa.h:11:44: error: unknown type name 'ecc_key'
signkey.c: In function 'buf_get_pub_key':
signkey.c:318:17: error: 'DROPBEAR_SIGNKEY_SK_ECDSA_NISTP256' undeclared (first use in this function)
signkey.c:318:17: note: each undeclared identifier is reported only once for each function it appears in
signkey.c: In function 'buf_verify':
signkey.c:688:17: error: 'DROPBEAR_SIGNKEY_SK_ECDSA_NISTP256' undeclared (first use in this function)
signkey.c:689:3: error: unknown type name 'ecc_key'
signkey.c:689:20: error: 'ecc_key' undeclared (first use in this function)
signkey.c:689:29: error: expected expression before ')' token
make[1]: *** [Makefile:154: signkey.o] Error 1

[LeSpocky]

https://lore.ptxdist.org/ptxdist/20220704121831.23787-1-ada@thorsis.com/T/#t

[LeSpocky]

Applied with fe0bcfd2aed916620677d63432defec21e72d523 and following.