diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2013-01-10 17:54:05 +0100 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2013-01-10 17:54:05 +0100 |
| commit | 0159f6a3459c511c94b009afd0bfe5dc8e8991d1 (patch) | |
| tree | 3c12297fd9b61426d6873c3c821360ef71e01448 /src/openvpn/push.c | |
| parent | c0bce9e49cf1fbeda1269e93d9818e4861725e71 (diff) | |
| parent | 9e3cceecfca10ef806f193ec41e0e0a44706c328 (diff) | |
Merge tag 'upstream/2.3.0'
Upstream version 2.3.0
Diffstat (limited to 'src/openvpn/push.c')
| -rw-r--r-- | src/openvpn/push.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 05a38e0..be50bef 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -446,10 +446,14 @@ process_incoming_push_msg (struct context *c, if (ch == ',') { struct buffer buf_orig = buf; + if (!c->c2.pulled_options_md5_init_done) + { + md5_state_init (&c->c2.pulled_options_state); + c->c2.pulled_options_md5_init_done = true; + } if (!c->c2.did_pre_pull_restore) { pre_pull_restore (&c->options); - md5_state_init (&c->c2.pulled_options_state); c->c2.did_pre_pull_restore = true; } if (apply_push_options (&c->options, @@ -463,6 +467,7 @@ process_incoming_push_msg (struct context *c, case 1: md5_state_update (&c->c2.pulled_options_state, BPTR(&buf_orig), BLEN(&buf_orig)); md5_state_final (&c->c2.pulled_options_state, &c->c2.pulled_options_digest); + c->c2.pulled_options_md5_init_done = false; ret = PUSH_MSG_REPLY; break; case 2: |