From patchwork Wed Sep 19 06:37:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 466 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director12.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id e+C5Cx98oltkPwAAIUCqbw for ; Wed, 19 Sep 2018 12:41:03 -0400 Received: from proxy5.mail.ord1d.rsapps.net ([172.30.191.6]) by director12.mail.ord1d.rsapps.net with LMTP id AJGLCx98olsWagAAIasKDg ; Wed, 19 Sep 2018 12:41:03 -0400 Received: from smtp8.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy5.mail.ord1d.rsapps.net with LMTP id iJEmCx98olvJbQAA8Zzt7w ; Wed, 19 Sep 2018 12:41:03 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp8.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dkim=fail (signature verification failed) header.d=gmail.com; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: YES X-Classification-ID: cb14522a-bc2a-11e8-a812-5254001e5a60-1-1 Received: from [216.105.38.7] ([216.105.38.7:57140] helo=lists.sourceforge.net) by smtp8.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4B/CD-30699-E1C72AB5; Wed, 19 Sep 2018 12:41:02 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1g2fWc-0003uZ-MS; Wed, 19 Sep 2018 16:40:26 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1g2fWb-0003uT-Jc for openvpn-devel@lists.sourceforge.net; Wed, 19 Sep 2018 16:40:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=e4NpE/kwvq4w1nYvOsdmQQSflKiviosSGnjo8bdL7Xw=; b=A8Hc4naXUHxBjmHHjx/cHMJBqs Qe8NZHupvr5sjcwITCx2B+gWa4u1ex8I8cQxaOHQ1tkJPySznfvpjQ3GAe5Ec0+HqIfXVYloebqw7 HPG+UayntItJOsV4DHVVg00VIkOc7ilmOy6R9lS6glOHUp65/nv6ho2Jue61c4Jdnugs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:MIME-Version: Content-Type:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=e4NpE/kwvq4w1nYvOsdmQQSflKiviosSGnjo8bdL7Xw=; b=E/bGB7R176P5rF6OUdHfpA13PS XvhR0BwhpmJzKmtk3MjtwBHWRM5oZ4lrEGxNsFUvRr7MCI5UGe121iW63tZpEIv9fO7v3o109nCoE E97ktOODTQJY6W17s/zqrzMLOGJjZZKZLktlykkVr0pPrkWZjsteQr72MnCPceayqxqM=; Received: from mail-ed1-f65.google.com ([209.85.208.65]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1g2fWZ-00FzFo-P2 for openvpn-devel@lists.sourceforge.net; Wed, 19 Sep 2018 16:40:25 +0000 Received: by mail-ed1-f65.google.com with SMTP id h4-v6so5451740edi.6 for ; Wed, 19 Sep 2018 09:40:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=e4NpE/kwvq4w1nYvOsdmQQSflKiviosSGnjo8bdL7Xw=; b=Wtj3/+9GuaM5WV958S/BkrpYNAgxQHWUcFyqZ1tC/REKUiBuaubIUtYRh/2n0XTquC EJOxomZ0FZhQnGkXu4NnLDB6/pFtW5qXodPbvvC9GeJTbUVPQMJKId/h+UOXtEP9me5g BepXjOC9ZRqKb/im8SoUkuGAC8GrNlNBr7q07oo4tQW4iZF3BzkKiEnzVv+7Wy20E6R/ lGScS2UMLuz4oH2xxECtuir7M1nCXI7uup7SFIKnHKtHu51461fLUe3Y2doStc9pcmvA CuIVaeE2A26MnnZ/60FcwlRxWNxrIh9aAHtf46Q5bikQEZIVCRNiqlLCXzRqX7fTIdms z/Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=e4NpE/kwvq4w1nYvOsdmQQSflKiviosSGnjo8bdL7Xw=; b=s/PJ/bB63kaTWOWMPxEIFgNi3CMjVDz3Nn1fhovV3Mq+mgLFY6FBrAl9krHA+8FO+u PTiLJiFOmgWCVPTjJF6h6HPQR1KhUBfpALOHpad6+B1qarPdDH1h4fRe135yWa4DEW7j 25W3OPuDj8XPHsQ279zjmeiBa/qV81ddMZq/Fn/H+TP2d/fPL/v+oIj78QYt2ZR8npo6 5ptsJjT6rlCvbefDSe8X72bKZe1SL1EZBHv8MWhmpn1ObhyChKKkTAi3SQjUZJn2J7Vu v+7jH/ub9Fxq3iIsGKRLpoTG6GUzdxgs6NtckSTbvoy8R4UF6K6tlVQZt2pc6ecd7VUD r5oQ== X-Gm-Message-State: APzg51BCy7w9eOb3fJSVM29dzglxaFyhHhfc/Z4cIobBGueQ30XD09PS v51Ndveh14+XDdCHx31nSfs5Hj4EPUA= X-Google-Smtp-Source: ANB0VdYkxalrbkIy8OWRaklYseOZP36moz+3elbH1ShKcNi/aUec1S0x29sEpj+6zGaIbMBibf4JhA== X-Received: by 2002:a50:ae83:: with SMTP id e3-v6mr60556947edd.16.1537375216689; Wed, 19 Sep 2018 09:40:16 -0700 (PDT) Received: from stipakov.fi (stipakov.fi. [128.199.52.117]) by smtp.gmail.com with ESMTPSA id c50-v6sm1386584edb.67.2018.09.19.09.40.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 19 Sep 2018 09:40:16 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 19 Sep 2018 19:37:42 +0300 Message-Id: <1537375062-1385-1-git-send-email-lstipakov@gmail.com> X-Mailer: git-send-email 2.7.4 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.208.65 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lstipakov[at]gmail.com) -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.65 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-Headers-End: 1g2fWZ-00FzFo-P2 Subject: [Openvpn-devel] [PATCH] Refactor NCP-negotiable options handling X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov This patch decouples setting/unsetting NCP options from the state of TLS context. At startup (and then per sighup) we load config (pre-NCP) values to c1, which persists over sigusr1. When tearing tunnel down we restore (possibly modified) c->options back to c1 (original) values. Fixes #1105 Signed-off-by: Lev Stipakov --- src/openvpn/init.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/src/openvpn/init.c b/src/openvpn/init.c index f432106..9353527 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -612,6 +612,33 @@ uninit_proxy(struct context *c) uninit_proxy_dowork(c); } +/* + * Assign NCP-negotiable options to context->c1 + * from context->options (initially config values). + * They persist over sigusr1 restart. + */ +static void +do_set_ncp_options(struct context *c) +{ + c->c1.ciphername = c->options.ciphername; + c->c1.authname = c->options.authname; + c->c1.keysize = c->options.keysize; +} + +/* + * Restore NCP-negotiable options from c->c1 to + * c->options. The latter ones can be altered by + * pushed options and therefore need to be restored + * to original values on sigusr1 restart. + */ +static void +do_unset_ncp_options(struct context *c) +{ + c->options.ciphername = c->c1.ciphername; + c->options.authname = c->c1.authname; + c->options.keysize = c->c1.keysize; +} + void context_init_1(struct context *c) { @@ -621,6 +648,8 @@ context_init_1(struct context *c) init_connection_list(c); + do_set_ncp_options(c); + #if defined(ENABLE_PKCS11) if (c->first_time) { @@ -2593,10 +2622,6 @@ do_init_crypto_tls_c1(struct context *c) /* initialize tls-auth/crypt key */ do_init_tls_wrap_key(c); - c->c1.ciphername = options->ciphername; - c->c1.authname = options->authname; - c->c1.keysize = options->keysize; - #if 0 /* was: #if ENABLE_INLINE_FILES -- Note that enabling this code will break restarts */ if (options->priv_key_file_inline) { @@ -2609,11 +2634,6 @@ do_init_crypto_tls_c1(struct context *c) { msg(D_INIT_MEDIUM, "Re-using SSL/TLS context"); - /* Restore pre-NCP cipher options */ - c->options.ciphername = c->c1.ciphername; - c->options.authname = c->c1.authname; - c->options.keysize = c->c1.keysize; - /* * tls-auth/crypt key can be configured per connection block, therefore * we must reload it as it may have changed @@ -4293,6 +4313,8 @@ close_instance(struct context *c) /* free key schedules */ do_close_free_key_schedule(c, (c->mode == CM_P2P || c->mode == CM_TOP)); + do_unset_ncp_options(c); + /* close TCP/UDP connection */ do_close_link_socket(c);