diff options
| author | Alexander Dahl <post@lespocky.de> | 2016-03-21 18:46:30 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-04-11 18:22:04 +0200 |
| commit | 664a0a7d25cab1104285237c75cd69c178402a64 (patch) | |
| tree | 19426438dfc20eb2786e5ff369bb19a92c623aa2 /patches | |
| parent | 39261d0186a513f79f82054e6ea03543b0fe66e6 (diff) | |
| download | ptxdist-664a0a7d25cab1104285237c75cd69c178402a64.tar.gz ptxdist-664a0a7d25cab1104285237c75cd69c178402a64.tar.xz | |
dropbear: upgrade from 2015.67 to 2016.73
Dropped patch series, because build with ENABLE_CLI_PUBKEY_AUTH unset
was fixed in 2015.68.
2016.72 fixes CVE-2016-3116.
Additional changes contain fixes for crashes, memory leaks, compile
warnings, build for certain platforms or in certain invironments, and
race conditions. Improved efficiency, manpage, memory consumption.
Various cleanups for issues found by lint tools and static code
analyzers.
Signed-off-by: Alexander Dahl <post@lespocky.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch | 45 | ||||
| -rw-r--r-- | patches/dropbear-2015.67/series | 4 |
2 files changed, 0 insertions, 49 deletions
diff --git a/patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch b/patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch deleted file mode 100644 index 6fc655a95..000000000 --- a/patches/dropbear-2015.67/0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: Juergen Borleis <jbe@pengutronix.de> -Date: Fri, 13 Mar 2015 10:53:46 +0100 -Subject: [PATCH] dropbear: disabling ENABLE_CLI_PUBKEY_AUTH let the build - fail - -Function multihop_passthrough_args() fails due to missing 'privkeys' member -in structure 'cli_runopts'. So lets also disable ENABLE_CLI_MULTIHOP for -this case. -And even cli_getopts() fails due to missing loadidentityfile() function -in this case. - -Signed-off-by: Juergen Borleis <jbe@pengutronix.de> ---- - options.h | 4 +++- - sysoptions.h | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/options.h b/options.h -index 6339b0a4738e..1360b5c6758f 100644 ---- a/options.h -+++ b/options.h -@@ -218,7 +218,9 @@ much traffic. */ - - /* A default argument for dbclient -i <privatekey>. - leading "~" is expanded */ --#define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear" -+#ifdef ENABLE_CLI_PUBKEY_AUTH -+# define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear" -+#endif - - /* This variable can be used to set a password for client - * authentication on the commandline. Beware of platforms -diff --git a/sysoptions.h b/sysoptions.h -index bec72461d8e4..eeb78cb129a5 100644 ---- a/sysoptions.h -+++ b/sysoptions.h -@@ -202,7 +202,7 @@ - #define USING_LISTENERS - #endif - --#if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) -+#if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) && defined(ENABLE_CLI_PUBKEY_AUTH) - #define ENABLE_CLI_MULTIHOP - #endif - diff --git a/patches/dropbear-2015.67/series b/patches/dropbear-2015.67/series deleted file mode 100644 index 501905e99..000000000 --- a/patches/dropbear-2015.67/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-dropbear-disabling-ENABLE_CLI_PUBKEY_AUTH-let-the-bu.patch -# 847698d613b5ea08c9504df4ed3f0099 - git-ptx-patches magic |