mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-28 06:32:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

dropbear: upgrade 2020.81 -> 2022.82

Browse Source 
refresh the following patches for new version:
0001-urandom-xauth-changes-to-options.h.patch
0005-dropbear-enable-pam.patch
dropbear-disable-weak-ciphers.patch

Changelog:
https://github.com/mkj/dropbear/releases/tag/DROPBEAR_2022.82

(From OE-Core rev: d5f9c44ede9babd0f48306cfefe4a16065e8ea30)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
wangmy
2022-04-19 18:31:18 +08:00
committed by Richard Purdie
parent 41984559c8
commit a4df7ceead
5 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-core/dropbear/dropbear/0001-urandom-xauth-changes-to-options.h.patch
View File

@@ -6,10 +6,10 @@ Upstream-Status: Inappropriate [configuration]
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/default_options.h b/default_options.h
index 3b75eb8..1fd8082 100644
index 349338c..5ffac25 100644
--- a/default_options.h
+++ b/default_options.h
@@ -243,7 +243,7 @@ Homedir is prepended unless path begins with / */
@@ -289,7 +289,7 @@ group1 in Dropbear server too */
/* The command to invoke for xauth when using X11 forwarding.
* "-q" for quiet */
@@ -17,7 +17,7 @@ index 3b75eb8..1fd8082 100644
+#define XAUTH_COMMAND "xauth -q"
/* if you want to enable running an sftp server (such as the one included with
/* If you want to enable running an sftp server (such as the one included with
--
1.7.11.7
2.25.1

13
meta/recipes-core/dropbear/dropbear/0005-dropbear-enable-pam.patch
View File

@@ -15,10 +15,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/default_options.h b/default_options.h
index 3b75eb8..8617cd0 100644
index 0e3d027..349338c 100644
--- a/default_options.h
+++ b/default_options.h
@@ -179,7 +179,7 @@ group1 in Dropbear server too */
@@ -210,7 +210,7 @@ group1 in Dropbear server too */
/* Authentication Types - at least one required.
RFC Draft requires pubkey auth, and recommends password */
@@ -27,16 +27,15 @@ index 3b75eb8..8617cd0 100644
/* Note: PAM auth is quite simple and only works for PAM modules which just do
* a simple "Login: " "Password: " (you can edit the strings in svr-authpam.c).
@@ -187,7 +187,7 @@ group1 in Dropbear server too */
@@ -218,7 +218,7 @@ group1 in Dropbear server too */
* but there's an interface via a PAM module. It won't work for more complex
* PAM challenge/response.
* You can't enable both PASSWORD and PAM. */
-#define DROPBEAR_SVR_PAM_AUTH 0
+#define DROPBEAR_SVR_PAM_AUTH 1
/* ~/.ssh/authorized_keys authentication */
#define DROPBEAR_SVR_PUBKEY_AUTH 1
/* ~/.ssh/authorized_keys authentication.
* You must define DROPBEAR_SVR_PUBKEY_AUTH in order to use plugins. */
--
2.1.4
2.25.1

20
meta/recipes-core/dropbear/dropbear/dropbear-disable-weak-ciphers.patch
View File

@@ -9,27 +9,23 @@ and we want to support the stong algorithms.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Joseph Reynolds <joseph.reynolds1@ibm.com>
---
default_options.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
default_options.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/default_options.h b/default_options.h
index 1aa2297..7ff1394 100644
index d417588..bc5200f 100644
--- a/default_options.h
+++ b/default_options.h
@@ -163,12 +163,12 @@ IMPORTANT: Some options will require "make clean" after changes */
@@ -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
*/
*/
-#define DROPBEAR_DH_GROUP14_SHA1 1
+#define DROPBEAR_DH_GROUP14_SHA1 0
#define DROPBEAR_DH_GROUP14_SHA256 1
#define DROPBEAR_DH_GROUP16 0
#define DROPBEAR_CURVE25519 1
#define DROPBEAR_ECDH 1
-#define DROPBEAR_DH_GROUP1 1
+#define DROPBEAR_DH_GROUP1 0
/* When group1 is enabled it will only be allowed by Dropbear client
not as a server, due to concerns over its strength. Set to 0 to allow
--
2.25.1

3
meta/recipes-core/dropbear/dropbear_2020.81.bb
View File

@@ -1,3 +0,0 @@
require dropbear.inc
SRC_URI[sha256sum] = "48235d10b37775dbda59341ac0c4b239b82ad6318c31568b985730c788aac53b"

3
meta/recipes-core/dropbear/dropbear_2022.82.bb Normal file
View File

@@ -0,0 +1,3 @@
require dropbear.inc
SRC_URI[sha256sum] = "3a038d2bbc02bf28bbdd20c012091f741a3ec5cbe460691811d714876aad75d1"