diff options
| author | Bernhard Schmidt <berni@debian.org> | 2018-10-14 22:51:08 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2018-10-14 22:51:08 +0200 |
| commit | 87c2fd4310e5b345102d7a4915dc5e3a65052305 (patch) | |
| tree | b7dc3d6d209bdb926c9e1ece7f9639aa1724b39e /src/openvpn/forward.c | |
| parent | 3804bc2606a92e2f2f4b3a2b043af0d77d92b386 (diff) | |
Revert "Merge branch 'stretch' of ssh://git.debian.org/git/collab-maint/openvpn into stretch"
This reverts commit 3804bc2606a92e2f2f4b3a2b043af0d77d92b386, reversing
changes made to 678cfd249add7ca758e4c41933c7b730132c99f4.
Diffstat (limited to 'src/openvpn/forward.c')
| -rw-r--r-- | src/openvpn/forward.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/openvpn/forward.c b/src/openvpn/forward.c index 2f3f3c5..8102e94 100644 --- a/src/openvpn/forward.c +++ b/src/openvpn/forward.c @@ -866,16 +866,9 @@ process_incoming_link_part1(struct context *c, struct link_socket_info *lsi, boo * will load crypto_options with the correct encryption key * and return false. */ - uint8_t opcode = *BPTR(&c->c2.buf) >> P_OPCODE_SHIFT; if (tls_pre_decrypt(c->c2.tls_multi, &c->c2.from, &c->c2.buf, &co, floated, &ad_start)) { - /* Restore pre-NCP frame parameters */ - if (is_hard_reset(opcode, c->options.key_method)) - { - c->c2.frame = c->c2.frame_initial; - } - interval_action(&c->c2.tmp_int); /* reset packet received timer if TLS packet */ |