diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-02 07:00:36 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-10-02 07:00:36 +0200 |
commit | 3804bc2606a92e2f2f4b3a2b043af0d77d92b386 (patch) | |
tree | ad5df7aa0b975693a09335d296ee56457ef6076e /debian/patches/812-fix-push-options-digest-update.patch | |
parent | 749384a154025e268b53cf3cc79eaeddde2b3ceb (diff) | |
parent | 678cfd249add7ca758e4c41933c7b730132c99f4 (diff) |
Merge branch 'stretch' of ssh://git.debian.org/git/collab-maint/openvpn into stretchstretch
Diffstat (limited to 'debian/patches/812-fix-push-options-digest-update.patch')
-rw-r--r-- | debian/patches/812-fix-push-options-digest-update.patch | 31 |
1 files changed, 31 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 |