summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-12-07 15:15:29 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-08 15:24:27 (GMT)
commit006e5925f22d08a8acd6bf57f343c1e2b0242f24 (patch)
treefea10ea2e4ef210d1f7534fb2a6988f2e803f8d8 /meta/recipes-core/dropbear
parent87377c2b5788b86c6aecaf47f9cef511c23edc12 (diff)
downloadpoky-006e5925f22d08a8acd6bf57f343c1e2b0242f24.tar.gz
dropbear: Upgrade from 0.53.1 to 2011.54
This new version added ALLOW_BLANK_PASSWORD option. So change the allow-nopw.patch content to enable this function. (From OE-Core rev: e876096fcbb42039d568a7acbc506e4099e9a443) Signed-off-by: Mei Lei <lei.mei@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/dropbear')
-rw-r--r--meta/recipes-core/dropbear/dropbear-2011.54/configure.patch (renamed from meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch)0
-rw-r--r--meta/recipes-core/dropbear/dropbear/allow-nopw.patch55
-rw-r--r--meta/recipes-core/dropbear/dropbear_0.53.1.bb6
-rw-r--r--meta/recipes-core/dropbear/dropbear_2011.54.bb6
4 files changed, 23 insertions, 44 deletions
diff --git a/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch b/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
index aeb7c0a..aeb7c0a 100644
--- a/meta/recipes-core/dropbear/dropbear-0.53.1/configure.patch
+++ b/meta/recipes-core/dropbear/dropbear-2011.54/configure.patch
diff --git a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
index 3909ef2..a175ee1 100644
--- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
+++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
@@ -1,40 +1,19 @@
1Upstream-Status: Inappropriate [embedded specific] 1Enable blank password login function for new release dropbear.
2 2
3diff --git a/svr-auth.c b/svr-auth.c 3Upstream-Status: Inappropriate [configuration]
4index 87e3c5e..3e78c1a 100644 4
5--- a/svr-auth.c 5Signed-off-by: Mei Lei <lei.mei@intel.com>
6+++ b/svr-auth.c 6
7@@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { 7diff --git a/options.h b/options.h
8 } 8index 73689ad..041ddaa 100644
9 9--- a/options.h
10 /* check for an empty password */ 10+++ b/options.h
11+#ifdef DISALLOW_EMPTY_PW 11@@ -180,7 +180,7 @@ much traffic. */
12 if (ses.authstate.pw_passwd[0] == '\0') { 12 * Public key logins are allowed for blank-password accounts regardless of this
13 TRACE(("leave checkusername: empty pword")) 13 * setting. PAM is not affected by this setting, it uses the normal pam.d
14 dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", 14 * settings ('nullok' option) */
15@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) { 15-/* #define ALLOW_BLANK_PASSWORD */
16 send_msg_userauth_failure(0, 1); 16+#define ALLOW_BLANK_PASSWORD
17 return DROPBEAR_FAILURE;
18 }
19+#endif
20
21 TRACE(("shell is %s", ses.authstate.pw_shell))
22
23diff --git a/svr-authpasswd.c b/svr-authpasswd.c
24index a29fd63..6a3c7e9 100644
25--- a/svr-authpasswd.c
26+++ b/svr-authpasswd.c
27@@ -64,9 +64,13 @@ void svr_auth_password() {
28 * since the shadow password may differ to that tested
29 * in auth.c */
30 if (passwdcrypt[0] == '\0') {
31+#ifdef DISALLOW_EMPTY_PASSWD
32 dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
33 ses.authstate.pw_name);
34 send_msg_userauth_failure(0, 1);
35+#else
36+ send_msg_userauth_success();
37+#endif
38 return;
39 }
40 17
18 #define ENABLE_CLI_PASSWORD_AUTH
19 #define ENABLE_CLI_PUBKEY_AUTH
diff --git a/meta/recipes-core/dropbear/dropbear_0.53.1.bb b/meta/recipes-core/dropbear/dropbear_0.53.1.bb
deleted file mode 100644
index 54f86e8..0000000
--- a/meta/recipes-core/dropbear/dropbear_0.53.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03"
4SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6"
5
6PR = "r0"
diff --git a/meta/recipes-core/dropbear/dropbear_2011.54.bb b/meta/recipes-core/dropbear/dropbear_2011.54.bb
new file mode 100644
index 0000000..b7b4b83
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2011.54.bb
@@ -0,0 +1,6 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
4SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
5
6PR = "r0"