dropbear: upgrade to version 5.02
from 0.49 clarify license changes: - rebase allow-nopw.patch, some fields in the original file are renamed - rebase urandom-xauth-changes-to-options.h.patch, urandom change is already in upstream Signed-off-by: Qing He <qing.he@intel.com>
This commit is contained in:
parent
47b2545009
commit
0f8810e6be
|
@ -1,7 +1,12 @@
|
||||||
DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
|
DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
|
||||||
HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
|
HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
|
||||||
SECTION = "console/network"
|
SECTION = "console/network"
|
||||||
|
|
||||||
|
# some files are from other projects and have others license terms:
|
||||||
|
# public domain, OpenSSH 3.5p1, OpenSSH3.6.1p2, PuTTY
|
||||||
LICENSE = "MIT"
|
LICENSE = "MIT"
|
||||||
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=3a5b0c2f0d0c49dfde9558ae2036683c"
|
||||||
|
|
||||||
DEPENDS = "zlib"
|
DEPENDS = "zlib"
|
||||||
PROVIDES = "ssh sshd"
|
PROVIDES = "ssh sshd"
|
||||||
RPROVIDES = "ssh sshd"
|
RPROVIDES = "ssh sshd"
|
||||||
|
|
|
@ -1,33 +1,34 @@
|
||||||
diff -Nurd dropbear-0.45/svr-auth.c dropbear-0.45.patched/svr-auth.c
|
diff --git a/svr-auth.c b/svr-auth.c
|
||||||
--- dropbear-0.45/svr-auth.c 2005-03-06 20:27:02.000000000 -0800
|
index 5da0aa7..4de4964 100644
|
||||||
+++ dropbear-0.45.patched/svr-auth.c 2005-03-08 15:22:43.998592744 -0800
|
--- a/svr-auth.c
|
||||||
@@ -237,6 +237,7 @@
|
+++ b/svr-auth.c
|
||||||
|
@@ -249,6 +249,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for an empty password */
|
/* check for an empty password */
|
||||||
+#ifdef DISALLOW_EMPTY_PW
|
+#ifdef DISALLOW_EMPTY_PW
|
||||||
if (ses.authstate.pw->pw_passwd[0] == '\0') {
|
if (ses.authstate.pw_passwd[0] == '\0') {
|
||||||
TRACE(("leave checkusername: empty pword"))
|
TRACE(("leave checkusername: empty pword"))
|
||||||
dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
|
dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
|
||||||
@@ -244,7 +245,7 @@
|
@@ -256,6 +257,7 @@ static int checkusername(unsigned char *username, unsigned int userlen) {
|
||||||
send_msg_userauth_failure(0, 1);
|
send_msg_userauth_failure(0, 1);
|
||||||
return DROPBEAR_FAILURE;
|
return DROPBEAR_FAILURE;
|
||||||
}
|
}
|
||||||
-
|
|
||||||
+#endif
|
+#endif
|
||||||
TRACE(("shell is %s", ses.authstate.pw->pw_shell))
|
|
||||||
|
|
||||||
/* check that the shell is set */
|
TRACE(("shell is %s", ses.authstate.pw_shell))
|
||||||
diff -Nurd dropbear-0.45/svr-authpasswd.c dropbear-0.45.patched/svr-authpasswd.c
|
|
||||||
--- dropbear-0.45/svr-authpasswd.c 2005-03-06 20:27:02.000000000 -0800
|
diff --git a/svr-authpasswd.c b/svr-authpasswd.c
|
||||||
+++ dropbear-0.45.patched/svr-authpasswd.c 2005-03-08 15:22:44.010591023 -0800
|
index 53550a2..7b896bd 100644
|
||||||
@@ -64,9 +64,13 @@
|
--- 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
|
* since the shadow password may differ to that tested
|
||||||
* in auth.c */
|
* in auth.c */
|
||||||
if (passwdcrypt[0] == '\0') {
|
if (passwdcrypt[0] == '\0') {
|
||||||
+#ifdef DISALLOW_EMPTY_PASSWD
|
+#ifdef DISALLOW_EMPTY_PASSWD
|
||||||
dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
|
dropbear_log(LOG_WARNING, "user '%s' has blank password, rejected",
|
||||||
ses.authstate.printableuser);
|
ses.authstate.pw_name);
|
||||||
send_msg_userauth_failure(0, 1);
|
send_msg_userauth_failure(0, 1);
|
||||||
+#else
|
+#else
|
||||||
+ send_msg_userauth_success();
|
+ send_msg_userauth_success();
|
||||||
|
|
|
@ -1,15 +1,6 @@
|
||||||
diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h
|
diff -Nurd dropbear-0.45/options.h dropbear-0.45.patched/options.h
|
||||||
--- dropbear-0.45/options.h 2005-03-06 20:27:02.000000000 -0800
|
--- dropbear-0.45/options.h 2005-03-06 20:27:02.000000000 -0800
|
||||||
+++ dropbear-0.45.patched/options.h 2005-03-08 15:25:09.368742090 -0800
|
+++ dropbear-0.45.patched/options.h 2005-03-08 15:25:09.368742090 -0800
|
||||||
@@ -143,7 +143,7 @@
|
|
||||||
* however significantly reduce the security of your ssh connections
|
|
||||||
* if the PRNG state becomes guessable - make sure you know what you are
|
|
||||||
* doing if you change this. */
|
|
||||||
-#define DROPBEAR_RANDOM_DEV "/dev/random"
|
|
||||||
+#define DROPBEAR_RANDOM_DEV "/dev/urandom"
|
|
||||||
|
|
||||||
/* prngd must be manually set up to produce output */
|
|
||||||
/*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/
|
|
||||||
@@ -167,7 +167,7 @@
|
@@ -167,7 +167,7 @@
|
||||||
/* The command to invoke for xauth when using X11 forwarding.
|
/* The command to invoke for xauth when using X11 forwarding.
|
||||||
* "-q" for quiet */
|
* "-q" for quiet */
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require dropbear.inc
|
require dropbear.inc
|
||||||
|
|
||||||
PR="r2"
|
PR="r0"
|
Loading…
Reference in New Issue