aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/dropbear/patches/120-openwrt_options.patch
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-04-18 11:25:01 +0000
committerSteven Barth <steven@midlink.org>2015-04-18 11:25:01 +0000
commit5225254859c1dd727aaa6aefce3a2cefe7e93db5 (patch)
tree9c24bb7dbf03a3227ae83cb06a3b91cc20bf7c02 /package/network/services/dropbear/patches/120-openwrt_options.patch
parentcfa635cf85c288746d4e004ab77e3ddf94419820 (diff)
downloadupstream-5225254859c1dd727aaa6aefce3a2cefe7e93db5.tar.gz
upstream-5225254859c1dd727aaa6aefce3a2cefe7e93db5.tar.bz2
upstream-5225254859c1dd727aaa6aefce3a2cefe7e93db5.zip
dropbear: update to 2015.67
fixes dbclient login into OpenSSH 6.8p1 error: "Bad hostkey signature" reported on irc, replicated with Arch Linux Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45493 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/dropbear/patches/120-openwrt_options.patch')
-rw-r--r--package/network/services/dropbear/patches/120-openwrt_options.patch25
1 files changed, 9 insertions, 16 deletions
diff --git a/package/network/services/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch
index 1b5c5cb1e8..48dae73b1f 100644
--- a/package/network/services/dropbear/patches/120-openwrt_options.patch
+++ b/package/network/services/dropbear/patches/120-openwrt_options.patch
@@ -18,27 +18,20 @@
/* Whether to support "-c" and "-m" flags to choose ciphers/MACs at runtime */
#define ENABLE_USER_ALGO_LIST
-@@ -95,8 +95,8 @@ much traffic. */
- #define DROPBEAR_AES256
- /* Compiling in Blowfish will add ~6kB to runtime heap memory usage */
- /*#define DROPBEAR_BLOWFISH*/
--#define DROPBEAR_TWOFISH256
--#define DROPBEAR_TWOFISH128
-+/*#define DROPBEAR_TWOFISH256
-+#define DROPBEAR_TWOFISH128*/
-
- /* Enable "Counter Mode" for ciphers. This is more secure than normal
- * CBC mode against certain attacks. This adds around 1kB to binary
-@@ -122,7 +122,7 @@ much traffic. */
+@@ -126,9 +126,9 @@ much traffic. */
* If you disable MD5, Dropbear will fall back to SHA1 fingerprints,
* which are not the standard form. */
#define DROPBEAR_SHA1_HMAC
-#define DROPBEAR_SHA1_96_HMAC
+-#define DROPBEAR_SHA2_256_HMAC
+-#define DROPBEAR_SHA2_512_HMAC
+/*#define DROPBEAR_SHA1_96_HMAC*/
- /*#define DROPBEAR_SHA2_256_HMAC*/
- /*#define DROPBEAR_SHA2_512_HMAC*/
++/*#define DROPBEAR_SHA2_256_HMAC*/
++/*#define DROPBEAR_SHA2_512_HMAC*/
#define DROPBEAR_MD5_HMAC
-@@ -175,7 +175,7 @@ much traffic. */
+
+ /* You can also disable integrity. Don't bother disabling this if you're
+@@ -184,7 +184,7 @@ much traffic. */
/* Whether to print the message of the day (MOTD). This doesn't add much code
* size */
@@ -47,7 +40,7 @@
/* The MOTD file path */
#ifndef MOTD_FILENAME
-@@ -213,7 +213,7 @@ much traffic. */
+@@ -226,7 +226,7 @@ much traffic. */
* note that it will be provided for all "hidden" client-interactive
* style prompts - if you want something more sophisticated, use
* SSH_ASKPASS instead. Comment out this var to remove this functionality.*/