summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-01 10:55:23 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-01 10:55:23 +0000
commitd779c21114e94a3e8f8bcfb362f2480f3e4e65e6 (patch)
tree5ab9d93b6e57551640fd1cef6cae29279330c3f5
parent525ba9fbeac575044f9d5a7f6a26f5cb1c30fade (diff)
[dropbear]
r25831 reduced the size of the dropbear executable by, among other things, disabling support for keyboard-interactive authentication. The default sshd configuration on Mac OS X only permits keyboard-interactive and public-key authentication, so unless a public key is set up, the default OpenWrt ssh client is now unable to connect to Mac OS X hosts. This patch re-enables keyboard-interactive authentication. In my tests, this increases the size of the stripped dropbear executable by 416 bytes on mips and 1,104 bytes on mipsel. In my opinion, such a small space savings isn't worthwhile when the resultant executable is severely hamstrung. Signed-off-by: Mark Mentovai <mark@moxienet.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26390 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/dropbear/Makefile2
-rw-r--r--package/dropbear/patches/120-openwrt_options.patch9
2 files changed, 1 insertions, 10 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 736cf3945..3fba1347e 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
PKG_VERSION:=0.53.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
diff --git a/package/dropbear/patches/120-openwrt_options.patch b/package/dropbear/patches/120-openwrt_options.patch
index bfae5b977..d1745e1e8 100644
--- a/package/dropbear/patches/120-openwrt_options.patch
+++ b/package/dropbear/patches/120-openwrt_options.patch
@@ -56,15 +56,6 @@
/* The MOTD file path */
#ifndef MOTD_FILENAME
-@@ -177,7 +177,7 @@ much traffic. */
-
- #define ENABLE_CLI_PASSWORD_AUTH
- #define ENABLE_CLI_PUBKEY_AUTH
--#define ENABLE_CLI_INTERACT_AUTH
-+/*#define ENABLE_CLI_INTERACT_AUTH*/
-
- /* This variable can be used to set a password for client
- * authentication on the commandline. Beware of platforms
@@ -185,7 +185,7 @@ much traffic. */
* note that it will be provided for all "hidden" client-interactive
* style prompts - if you want something more sophisticated, use