diff options
| author | Bernhard Schmidt <berni@debian.org> | 2020-04-19 15:52:38 +0200 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2020-04-19 15:52:38 +0200 |
| commit | 7728a9676dc67128c9adf56bc1d31a4e5b815b26 (patch) | |
| tree | ae25e1ac822e848183a4e61eac8d5c53f520f128 /src/openvpn/push.c | |
| parent | f90a78a23c77c840b764b0a95732f3ee3738ef99 (diff) | |
| parent | 620785fe268a1221c1ba7a9cb5a70f3140a4f1ca (diff) | |
Update upstream source from tag 'upstream/2.4.9'
Update to upstream version '2.4.9'
with Debian dir b64ac777b141e10bd0a11149a47506fd704401b8
Diffstat (limited to 'src/openvpn/push.c')
| -rw-r--r-- | src/openvpn/push.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/openvpn/push.c b/src/openvpn/push.c index dd5bd41..002be23 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -287,11 +287,16 @@ incoming_push_message(struct context *c, const struct buffer *buffer) { if (c->options.mode == MODE_SERVER) { + struct frame *frame_fragment = NULL; +#ifdef ENABLE_FRAGMENT + if (c->options.ce.fragment) + { + frame_fragment = &c->c2.frame_fragment; + } +#endif struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; - /* Do not regenerate keys if client send a second push request */ - if (!session->key[KS_PRIMARY].crypto_options.key_ctx_bi.initialized - && !tls_session_update_crypto_params(session, &c->options, - &c->c2.frame)) + if (!tls_session_update_crypto_params(session, &c->options, + &c->c2.frame, frame_fragment)) { msg(D_TLS_ERRORS, "TLS Error: initializing data channel failed"); goto error; |