summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Schmidt <berni@debian.org>2017-07-18 22:11:25 +0200
committerBernhard Schmidt <berni@debian.org>2017-07-18 22:15:50 +0200
commit4bf4d7a0fb651f3cae676fb982ad2149910432bd (patch)
treefec56c326416076c0cf9da8fc52e24ec7855eebf
parent3637e1aa7ac62f0bba5e9a196e42f22cb93a498b (diff)
Fix broken reconnect on connection loss due to wrong push digest calculation
https://community.openvpn.net/openvpn/ticket/812 Thanks: Patrick Matthäi for testing Closes: #863110
-rw-r--r--debian/patches/812-fix-push-options-digest-update.patch31
-rw-r--r--debian/patches/series1
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/812-fix-push-options-digest-update.patch b/debian/patches/812-fix-push-options-digest-update.patch
new file mode 100644
index 0000000..f79a27c
--- /dev/null
+++ b/debian/patches/812-fix-push-options-digest-update.patch
@@ -0,0 +1,31 @@
+From: Selva Nair <selva.nair@gmail.com>
+Date: Tue, 3 Jan 2017 16:42:18 -0500
+Subject: [PATCH] Fix push options digest update
+Bug: https://community.openvpn.net/openvpn/ticket/812
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863110
+
+Trac: #812
+
+Signed-off-by: Selva Nair <selva.nair@gmail.com>
+Acked-by: Steffan Karger <steffan.karger@fox-it.com>
+Message-Id: <1483479738-17672-1-git-send-email-selva.nair@gmail.com>
+URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13816.html
+Signed-off-by: Gert Doering <gert@greenie.muc.de>
+---
+ src/openvpn/push.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/openvpn/push.c b/src/openvpn/push.c
+index f5154756a..c9c04a630 100644
+--- a/src/openvpn/push.c
++++ b/src/openvpn/push.c
+@@ -692,8 +692,8 @@ push_update_digest(md_ctx_t *ctx, struct buffer *buf, const struct options *opt)
+ {
+ continue;
+ }
++ md_ctx_update(ctx, (const uint8_t *) line, strlen(line)+1);
+ }
+- md_ctx_update(ctx, (const uint8_t *) line, strlen(line)+1);
+ }
+
+ int
diff --git a/debian/patches/series b/debian/patches/series
index a83cda1..4357c69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ CVE-2017-7508.patch
CVE-2017-7520.patch
CVE-2017-7521.patch
CVE-2017-7521bis.patch
+812-fix-push-options-digest-update.patch