Gert Doering has submitted this change. ( https://gerrit.openvpn.net/c/openvpn/+/2167?usp=email )
Change subject: init: drop dead code in inherit_context_child() ...................................................................... init: drop dead code in inherit_context_child() The ciphername/authname copies are overwritten by the dest->options = src->options assignment that follows, and the trailing IS_SIG() return is a no-op. Change-Id: I5a827f4c6d169420504a48e13ee6eb28053dbc4c Signed-off-by: Razvan Cojocaru <[email protected]> Acked-by: Frank Lichtenheld <[email protected]> Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2167 Message-Id: <[email protected]> URL: https://lore.kernel.org/openvpn-devel/[email protected] Signed-off-by: Gert Doering <[email protected]> --- M src/openvpn/init.c 1 file changed, 0 insertions(+), 7 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index aef2f14..25521f3 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -4737,9 +4737,6 @@ dest->c1.ks.tls_wrap_key = src->c1.ks.tls_wrap_key; dest->c1.ks.tls_auth_key_type = src->c1.ks.tls_auth_key_type; dest->c1.ks.tls_crypt_v2_server_key = src->c1.ks.tls_crypt_v2_server_key; - /* inherit pre-NCP ciphers */ - dest->options.ciphername = src->options.ciphername; - dest->options.authname = src->options.authname; /* inherit auth-token */ dest->c1.ks.auth_token_key = src->c1.ks.auth_token_key; @@ -4796,10 +4793,6 @@ } init_instance(dest, src->c2.es, CC_NO_CLOSE | CC_USR1_TO_HUP); - if (IS_SIG(dest)) - { - return; - } } void -- To view, visit https://gerrit.openvpn.net/c/openvpn/+/2167?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.openvpn.net/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I5a827f4c6d169420504a48e13ee6eb28053dbc4c Gerrit-Change-Number: 2167 Gerrit-PatchSet: 2 Gerrit-Owner: Răzvan Cojocaru <[email protected]> Gerrit-Reviewer: Arne Schwabe <[email protected]> Gerrit-Reviewer: Frank Lichtenheld <[email protected]> Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
