From: Konstantin Demin <rockdrilla@gmail.com>
Date: Tue, 16 Oct 2018 13:31:35 +0000 (+0300)
Subject: dropbear: avoid empty input in base64_decode
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=831dbd9fd3ff682b4f10004e07d3f615f0d9fd51;p=openwrt%2Fstaging%2Fdedeckeh.git

dropbear: avoid empty input in base64_decode

cherry-pick upstream commit ee5769f31fc5bef0c0f5f6977523918af892fa3b

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
---

diff --git a/package/network/services/dropbear/patches/004-avoid-empty-input-in-base64_decode.patch b/package/network/services/dropbear/patches/004-avoid-empty-input-in-base64_decode.patch
new file mode 100644
index 0000000000..4f326c9b6c
--- /dev/null
+++ b/package/network/services/dropbear/patches/004-avoid-empty-input-in-base64_decode.patch
@@ -0,0 +1,12 @@
+--- a/signkey.c
++++ b/signkey.c
+@@ -580,6 +580,9 @@ int cmp_base64_key(const unsigned char*
+ 
+ 	/* now we have the actual data */
+ 	len = line->len - line->pos;
++	if (len == 0) {
++		return DROPBEAR_FAILURE;
++	}
+ 	decodekeylen = len * 2; /* big to be safe */
+ 	decodekey = buf_new(decodekeylen);
+