Skip to contentSkip to conversation

Fix push options digest update

PATCH In review [email protected]... 3 participants 3 messages Jan 3, 2017 – Jan 4, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix push options digest update

From: Selva Nair <[email protected]...>

---
 src/openvpn/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/push.c +1 -1
index f515475..c9c04a6 100644
@@ -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
Signature · 1 line
2.1.4
#1 lore raw
Quoted 13 lines · On 03-01-17 22:42, [email protected]... wrote:

From: Selva Nair <[email protected]...>

---
 src/openvpn/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/push.c +0 -0
index f515475..c9c04a6 100644

src/openvpn/push.c push_update_digest(md_ctx_t *ctx, struct buffer *buf, const struct options *opt) · line 699

Quoted 9 lines
src/openvpn/push.c +1 -1
@@ -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

ACK. And sorry for this 'one brace too far'... (It did ignore the cipher update nicely though ;) )

-Steffan

#2 lore raw
In reply to [email protected]...

Your patch has been applied to the master and release/2.4 branch.

Release/2.3 does not contain the offending commit.

Thanks!

commit a5dbf8c8dab23c47407c3f833c4f4aae52408af1 (master) commit bf72ae68c05922c289056f2f851ed36014449cdf (release/2.4)

Author: Selva Nair
Date:   Tue Jan 3 16:42:18 2017 -0500
     Fix push options digest update

     Signed-off-by: Selva Nair <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg13816.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering