aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2011-12-07 23:15:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-08 15:14:04 +0000
commite876096fcbb42039d568a7acbc506e4099e9a443 (patch)
tree7b7789a6182ddb87b0796115f15111bac2564466 /meta/recipes-core/dropbear
parentdc433b556f5b44a6d818a81df6be484ad59daebd (diff)
downloadopenembedded-core-contrib-e876096fcbb42039d568a7acbc506e4099e9a443.tar.gz
openembedded-core-contrib-e876096fcbb42039d568a7acbc506e4099e9a443.tar.bz2
openembedded-core-contrib-e876096fcbb42039d568a7acbc506e4099e9a443.zip
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. Signed-off-by: Mei Lei <lei.mei@intel.com>
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 aeb7c0a4ac0..aeb7c0a4ac0 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 3909ef26e72..a175ee14da1 100644
--- a/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
+++ b/meta/recipes-core/dropbear/dropbear/allow-nopw.patch
@@ -1,40 +1,19 @@
-Upstream-Status: Inappropriate [embedded specific]
+Enable blank password login function for new release dropbear.
-diff --git a/svr-auth.c b/svr-auth.c
-index 87e3c5e..3e78c1a 100644
---- a/svr-auth.c
-+++ b/svr-auth.c
-@@ -250,6 +250,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
- }
-
- /* check for an empty password */
-+#ifdef DISALLOW_EMPTY_PW
- if (ses.authstate.pw_passwd[0] == '\0') {
- TRACE(("leave checkusername: empty pword"))
- dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
-@@ -257,6 +258,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
- send_msg_userauth_failure(0, 1);
- return DROPBEAR_FAILURE;
- }
-+#endif
-
- TRACE(("shell is %s", ses.authstate.pw_shell))
-
-diff --git a/svr-authpasswd.c b/svr-authpasswd.c
-index a29fd63..6a3c7e9 100644
---- a/svr-authpasswd.c
-+++ b/svr-authpasswd.c
-@@ -64,9 +64,13 @@ void svr_auth_password() {
- * since the shadow password may differ to that tested
- * in auth.c */
- if (passwdcrypt[0] == '\0') {
-+#ifdef DISALLOW_EMPTY_PASSWD
- dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected",
- ses.authstate.pw_name);
- send_msg_userauth_failure(0, 1);
-+#else
-+ send_msg_userauth_success();
-+#endif
- return;
- }
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Mei Lei <lei.mei@intel.com>
+
+diff --git a/options.h b/options.h
+index 73689ad..041ddaa 100644
+--- a/options.h
++++ b/options.h
+@@ -180,7 +180,7 @@ much traffic. */
+ * Public key logins are allowed for blank-password accounts regardless of this
+ * setting. PAM is not affected by this setting, it uses the normal pam.d
+ * settings ('nullok' option) */
+-/* #define ALLOW_BLANK_PASSWORD */
++#define ALLOW_BLANK_PASSWORD
+ #define ENABLE_CLI_PASSWORD_AUTH
+ #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 54f86e80e06..00000000000
--- a/meta/recipes-core/dropbear/dropbear_0.53.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require dropbear.inc
-
-SRC_URI[md5sum] = "6b8d901859d9b8a18e2f6bfe0a892a03"
-SRC_URI[sha256sum] = "192538ca2a9ee778f12a2e8ddb6f098fa85dcb6457adc1cb40dd94b3c28f4df6"
-
-PR = "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 00000000000..b7b4b83e897
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2011.54.bb
@@ -0,0 +1,6 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
+SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
+
+PR = "r0"