diff options
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear')
6 files changed, 0 insertions, 232 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch b/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch deleted file mode 100644 index d1256161c4..0000000000 --- a/meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch +++ /dev/null @@ -1,58 +0,0 @@ -Upstream-Status: Submitted - - -dropbear: fix static build - -A more appropriate fix is to remove @CRYPTLIB@ from the objs -line, since it will cause problems with target checking, -this change also meets the goals of the orignal change which -was to not link libcrypt to all binaries. - -svr-authpasswd.o: In function `svr_auth_password': -svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt' -collect2: ld returned 1 exit status - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: dropbear-2011.54/Makefile.in -=================================================================== ---- dropbear-2011.54.orig/Makefile.in 2011-11-08 04:48:15.000000000 -0800 -+++ dropbear-2011.54/Makefile.in 2011-12-27 13:44:41.644354442 -0800 -@@ -56,7 +56,7 @@ - loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \ - listener.h fake-rfc2553.h - --dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@ -+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) - dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS) - dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) - dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) -@@ -158,7 +158,10 @@ - dropbearkey: $(dropbearkeyobjs) - dropbearconvert: $(dropbearconvertobjs) - --dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile -+dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile -+ $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@ -+ -+dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile - $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) - - # scp doesn't use the libs so is special. -@@ -169,14 +172,14 @@ - # multi-binary compilation. - MULTIOBJS= - ifeq ($(MULTI),1) -- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@ -+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) - CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI - endif - - dropbearmulti: multilink - - multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile -- $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) -+ $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@ - - multilink: multibinary $(addprefix link, $(PROGRAMS)) - diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch b/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch deleted file mode 100644 index 5e9455363a..0000000000 --- a/meta/recipes-core/dropbear/dropbear/dropbear-configuration-file.patch +++ /dev/null @@ -1,18 +0,0 @@ -dropbear: Change the path ("/etc/pam.d/sshd" as default) to find a pam configuration file \ -to "/etc/pam.d/dropbear for dropbear when enabling pam supporting" - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> - ---- a/svr-authpam.c 2008-11-11 22:09:03.000000000 +0800 -+++ b/svr-authpam.c.new 2011-08-29 09:53:24.000000000 +0800 -@@ -199,7 +199,7 @@ - userData.passwd = password; - - /* Init pam */ -- if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { -+ if ((rc = pam_start("dropbear", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) { - dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s\n", - rc, pam_strerror(pamHandlep, rc)); - goto cleanup; diff --git a/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch b/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch deleted file mode 100644 index 004d773dc3..0000000000 --- a/meta/recipes-core/dropbear/dropbear/dropbear-enable-pam.patch +++ /dev/null @@ -1,22 +0,0 @@ -dropbear: We need modify file option.h besides enabling pam in \ -configure if we want dropbear to support pam. - -Upstream-Status: Pending - -Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> - ---- a/options.h 2011-07-12 13:27:39.008819183 +0800 -+++ b/options.h.new 2011-07-12 13:37:37.780819308 +0800 -@@ -149,9 +149,9 @@ - * but there's an interface via a PAM module - don't bother using it otherwise. - * You can't enable both PASSWORD and PAM. */ - --#define ENABLE_SVR_PASSWORD_AUTH -+//#define ENABLE_SVR_PASSWORD_AUTH - /* PAM requires ./configure --enable-pam */ --/*#define ENABLE_SVR_PAM_AUTH*/ -+#define ENABLE_SVR_PAM_AUTH - #define ENABLE_SVR_PUBKEY_AUTH - - /* Wether to ake public key options in authorized_keys file into account */ - diff --git a/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch deleted file mode 100644 index 3b919f6759..0000000000 --- a/meta/recipes-core/dropbear/dropbear/fix-2kb-keys.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff -Nurd dropbear-0.45/kex.h dropbear-0.45.patched/kex.h ---- dropbear-0.45/kex.h 2005-03-06 20:27:02.000000000 -0800 -+++ dropbear-0.45.patched/kex.h 2005-03-08 15:22:44.064583279 -0800 -@@ -64,6 +64,6 @@ - - }; - --#define MAX_KEXHASHBUF 2000 -+#define MAX_KEXHASHBUF 3000 - - #endif /* _KEX_H_ */ diff --git a/meta/recipes-core/dropbear/dropbear/nopw-option.patch b/meta/recipes-core/dropbear/dropbear/nopw-option.patch deleted file mode 100644 index 2ff84d24b3..0000000000 --- a/meta/recipes-core/dropbear/dropbear/nopw-option.patch +++ /dev/null @@ -1,106 +0,0 @@ -Allow configuring "allow blank password option" at runtime - -Changes this from a compile-time switch to a command-line option. - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -Upstream-Status: Accepted [expected in next release after 2012.55] - -diff --git a/options.h b/options.h -index 00f6179..b8d0ccb 100644 ---- a/options.h -+++ b/options.h -@@ -176,12 +176,6 @@ much traffic. */ - #define ENABLE_SVR_PUBKEY_OPTIONS - #endif - --/* Define this to allow logging in to accounts that have no password specified. -- * 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 ENABLE_CLI_PASSWORD_AUTH - #define ENABLE_CLI_PUBKEY_AUTH - #define ENABLE_CLI_INTERACT_AUTH -diff --git a/runopts.h b/runopts.h -index 83b5861..126585b 100644 ---- a/runopts.h -+++ b/runopts.h -@@ -85,6 +85,7 @@ typedef struct svr_runopts { - - int noauthpass; - int norootpass; -+ int allowblankpass; - - #ifdef ENABLE_SVR_REMOTETCPFWD - int noremotetcp; -diff --git a/svr-authpasswd.c b/svr-authpasswd.c -index 54b4889..d9b7928 100644 ---- a/svr-authpasswd.c -+++ b/svr-authpasswd.c -@@ -29,6 +29,7 @@ - #include "buffer.h" - #include "dbutil.h" - #include "auth.h" -+#include "runopts.h" - - #ifdef ENABLE_SVR_PASSWORD_AUTH - -@@ -78,16 +79,17 @@ void svr_auth_password() { - - /* check for empty password */ - if (passwdcrypt[0] == '\0') { --#ifdef ALLOW_BLANK_PASSWORD -- if (passwordlen == 0) { -- success_blank = 1; -+ if (svr_opts.allowblankpass) { -+ if (passwordlen == 0) { -+ success_blank = 1; -+ } -+ } -+ else { -+ dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", -+ ses.authstate.pw_name); -+ send_msg_userauth_failure(0, 1); -+ return; - } --#else -- dropbear_log(LOG_WARNING, "User '%s' has blank password, rejected", -- ses.authstate.pw_name); -- send_msg_userauth_failure(0, 1); -- return; --#endif - } - - if (success_blank || strcmp(testcrypt, passwdcrypt) == 0) { -diff --git a/svr-runopts.c b/svr-runopts.c -index c6e3508..b39ffb2 100644 ---- a/svr-runopts.c -+++ b/svr-runopts.c -@@ -63,6 +63,7 @@ static void printhelp(const char * progname) { - #if defined(ENABLE_SVR_PASSWORD_AUTH) || defined(ENABLE_SVR_PAM_AUTH) - "-s Disable password logins\n" - "-g Disable password logins for root\n" -+ "-B Allow blank password logins\n" - #endif - #ifdef ENABLE_SVR_LOCALTCPFWD - "-j Disable local port forwarding\n" -@@ -115,6 +116,7 @@ void svr_getopts(int argc, char ** argv) { - svr_opts.norootlogin = 0; - svr_opts.noauthpass = 0; - svr_opts.norootpass = 0; -+ svr_opts.allowblankpass = 0; - svr_opts.inetdmode = 0; - svr_opts.portcount = 0; - svr_opts.hostkey = NULL; -@@ -234,6 +236,9 @@ void svr_getopts(int argc, char ** argv) { - case 'g': - svr_opts.norootpass = 1; - break; -+ case 'B': -+ svr_opts.allowblankpass = 1; -+ break; - #endif - case 'h': - printhelp(argv[0]); diff --git a/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch b/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch deleted file mode 100644 index 4acc3974d6..0000000000 --- a/meta/recipes-core/dropbear/dropbear/urandom-xauth-changes-to-options.h.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff --git a/options.h b/options.h -index d309ab4..7fbe97b 100644 ---- a/options.h -+++ b/options.h -@@ -236,7 +236,7 @@ much traffic. */ - /* The command to invoke for xauth when using X11 forwarding. - * "-q" for quiet */ - #ifndef XAUTH_COMMAND --#define XAUTH_COMMAND "/usr/bin/X11/xauth -q" -+#define XAUTH_COMMAND "xauth -q" - #endif - - /* if you want to enable running an sftp server (such as the one included with |