From patchwork Fri Jan 18 23:30:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 664 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director10.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 8MpsCob8QlyCDAAAIUCqbw for ; Sat, 19 Jan 2019 05:31:34 -0500 Received: from proxy18.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net with LMTP id AO5DCob8QlySTAAApN4f7A ; Sat, 19 Jan 2019 05:31:34 -0500 Received: from smtp21.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy18.mail.ord1d.rsapps.net with LMTP id GL73CYb8Qly+SgAATCaURg ; Sat, 19 Jan 2019 05:31:34 -0500 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: smtp21.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=karger-me.20150623.gappssmtp.com; dmarc=none (p=nil; dis=none) header.from=karger.me X-Suspicious-Flag: YES X-Classification-ID: 63fbadda-1bd5-11e9-8b1f-525400a98691-1-1 Received: from [216.105.38.7] ([216.105.38.7:1207] helo=lists.sourceforge.net) by smtp21.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 84/73-22370-58CF24C5; Sat, 19 Jan 2019 05:31:33 -0500 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1gkntm-0001ri-QL; Sat, 19 Jan 2019 10:30:46 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1gkntl-0001rN-3o for openvpn-devel@lists.sourceforge.net; Sat, 19 Jan 2019 10:30:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: 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=e5ejpzng8/TECsTfV4LbU8lRDw7SnfYX93O9y4tRjM4=; b=JuGJAvL9CJTcsoDRoeAo0I+4VA QTTei7iPWhyq25P4gEFIBKuA/VR+WJKIMoZZdsFTL05eeahmATGkPp+dM6TSRCXd7SQzKL9eAT++p qW0O9FFlAHd0K2ufEN99x4VShf5pTz+XijotVWAGq/GD58lFpT2SAysWOJw1UscknyHQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=e5ejpzng8/TECsTfV4LbU8lRDw7SnfYX93O9y4tRjM4=; b=N6v4XZeO0jw6LrzO8/8q+D4sCx Sbd/zv6WUkpW5zTCccRy5k/PQWBsDCn+RVTGEBtaX8Wsq4S86SnympL/4mhahKNCRQbQzJ7ckLj26 krBMkpTVPZ7QiXJqBWHYpcI6Qgru7lfeGBGJjjNty60wkY758PDVjFoRE9r0ljF5dAyU=; Received: from mail-ed1-f66.google.com ([209.85.208.66]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1gknti-0001Oc-2l for openvpn-devel@lists.sourceforge.net; Sat, 19 Jan 2019 10:30:45 +0000 Received: by mail-ed1-f66.google.com with SMTP id f23so13106438edb.3 for ; Sat, 19 Jan 2019 02:30:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karger-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=e5ejpzng8/TECsTfV4LbU8lRDw7SnfYX93O9y4tRjM4=; b=kuaiU4MfnnBWiC0G6bwIS1zw3Vckp2nMgkcqd/HOPJclikbeRz8ijWr8MVk/zTmeT1 pE35cpleJZV+bxy3LqD3ITVykKtrnFg72UcQ1QwEKssFF+8B7qRFjGAiDpMWZg6e2x7Y aUh7m711+Q6tNA8wqaCOTB0Vdaq/CHCPKUNXz+l7ddoinDlr6oqaEngg3rn9atPbludN LLTk7qD3CnedLqlkp/bQjqD3cfTOPzX6mSXehFEDG9FiHZKIyehdg15W1jZDiPnj8Krb 8OeXJsWbtmkA4bxhpJLK/tRdj52PX0kUFpHwDN9ATWMRj5VYZZ4NGnccz/QoySByTvLT pKfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=e5ejpzng8/TECsTfV4LbU8lRDw7SnfYX93O9y4tRjM4=; b=QSHjDcIgUpfKHpJbam9NHqoRx5/YDuds8kgWtHkpNG3uwJ8iKoxqYbM4JRzfb2d3j2 X3lRH3V68DEdykYGDxnzLyQnr1/t5OGN4Wp8Z1Yyr9N+z3zKEJjU68Jad2fr+Y/bWtiy jGSA+fXD9OzaHGqymTxUpLk0aKqr49FBLV84pLINkGjp3m61ZZLy2uTmxecOS+F6KxGg Nhv6J5YD8G5dLssrMK7Ux3vCYxubb+mADs336LQ/AbFZUgTjEf9F8AzrG6Xjfqc1Fus1 jGrcpRUO2GT/lnsG4BTWXyZZ00jzeV2GYo7q8TQvAk7vt1vqKQZWWJAqHvD1g3evKQQs itag== X-Gm-Message-State: AJcUukdp6lk7b7HQJk3OYMk7jkGaqIgCpBK/OPiGKBP0E7pFb/Q7dPS/ eg/wj+39wr96vFReGuK5+JGLPUFo7M8= X-Google-Smtp-Source: ALg8bN68B3Qw4Q8zOxbG0VKKBftvZjkFwhCcV/FadJ9AoxaHzEjTTiUaemhgm1Jx7ol4IPmSJfanoQ== X-Received: by 2002:a50:94f4:: with SMTP id t49mr19510806eda.24.1547893835233; Sat, 19 Jan 2019 02:30:35 -0800 (PST) Received: from syzzer-tweakbak.fritz.box ([2001:985:e54:1:881e:647d:3c8e:6ee4]) by smtp.gmail.com with ESMTPSA id l51sm7769398edb.36.2019.01.19.02.30.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 19 Jan 2019 02:30:34 -0800 (PST) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Sat, 19 Jan 2019 11:30:28 +0100 Message-Id: <20190119103028.12497-1-steffan@karger.me> X-Mailer: git-send-email 2.17.1 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.66 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.208.66 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender X-Headers-End: 1gknti-0001Oc-2l Subject: [Openvpn-devel] [PATCH] Fix tls-auth/crypt in connection blocks with --persist-key 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 If --persist-key was used, we would always try to pre-load the 'global' tls-auth/crypt file. That would result in using the wrong key (leading to a failed connection) or en error is there was to 'global' key: Sat Jan 19 11:09:01 2019 Cannot pre-load tls-auth keyfile ((null)) Sat Jan 19 11:09:01 2019 Exiting due to fatal error Fix that by loading loading the key from the current connection entry. Signed-off-by: Steffan Karger Acked-By: Arne Schabe --- src/openvpn/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 0cf8db767..3d4da38d9 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2863,11 +2863,11 @@ options_postprocess_mutate_ce(struct options *o, struct connection_entry *ce) { if (ce->tls_auth_file && !ce->tls_auth_file_inline) { - struct buffer in = buffer_read_from_file(o->tls_auth_file, &o->gc); + struct buffer in = buffer_read_from_file(ce->tls_auth_file, &o->gc); if (!buf_valid(&in)) { msg(M_FATAL, "Cannot pre-load tls-auth keyfile (%s)", - o->tls_auth_file); + ce->tls_auth_file); } ce->tls_auth_file = INLINE_FILE_TAG;