aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:47:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:33:55 -0800
commit18300f8faa5050178efcd22f2db843f9b3f3bb0f (patch)
treefe645468edee95ea191fa0b803dc9e2dc0ea02f8
parentb1fa565ffa02796eaa55f5ac6700f1a932d62957 (diff)
downloadopenembedded-core-18300f8faa5050178efcd22f2db843f9b3f3bb0f.zip
openembedded-core-18300f8faa5050178efcd22f2db843f9b3f3bb0f.tar.gz
openembedded-core-18300f8faa5050178efcd22f2db843f9b3f3bb0f.tar.bz2
dropbear: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch b/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
index 7539d20..60c6a29 100644
--- a/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
+++ b/meta/recipes-core/dropbear/dropbear/0004-fix-2kb-keys.patch
@@ -5,18 +5,15 @@ Upstream-Status: Inappropriate [configuration]
kex.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/kex.h b/kex.h
-index 72430e9..375c677 100644
---- a/kex.h
-+++ b/kex.h
-@@ -67,6 +67,6 @@ struct KEXState {
- };
+Index: dropbear-2017.75/kex.h
+===================================================================
+--- dropbear-2017.75.orig/kex.h
++++ dropbear-2017.75/kex.h
+@@ -106,6 +106,6 @@ int curve25519_donna(unsigned char *out,
+ #endif
-#define MAX_KEXHASHBUF 2000
+#define MAX_KEXHASHBUF 3000
- #endif /* _KEX_H_ */
---
-1.7.11.7
-
+ #endif /* DROPBEAR_KEX_H_ */