From patchwork Mon Apr 2 01:44:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steffan Karger X-Patchwork-Id: 286 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 (Dovecot) with LMTP id o3PDN7UdwlriJwAAIUCqbw for ; Mon, 02 Apr 2018 08:10:29 -0400 Received: from proxy15.mail.ord1d.rsapps.net ([172.30.191.6]) by director10.mail.ord1d.rsapps.net (Dovecot) with LMTP id A36VN7UdwlpLXwAApN4f7A ; Mon, 02 Apr 2018 08:10:29 -0400 Received: from smtp14.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy15.mail.ord1d.rsapps.net with LMTP id KPWHN7UdwlrDfwAAAY1PeQ ; Mon, 02 Apr 2018 08:10:29 -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: smtp14.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: d53320f2-366e-11e8-a758-525400504bae-1-1 Received: from [216.105.38.7] ([216.105.38.7:31425] helo=lists.sourceforge.net) by smtp14.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 85/BC-06324-5BD12CA5; Mon, 02 Apr 2018 08:10:29 -0400 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1f2yHA-0004rC-WB; Mon, 02 Apr 2018 12:09:29 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1f2yH9-0004r3-7u for openvpn-devel@lists.sourceforge.net; Mon, 02 Apr 2018 12:09:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Uw/wdFN5Gv9qIychUKt8dUUOMxFU43zN1NH1mlpfHYQ=; b=HWZ4hkpHNsPHq54+LwDZ09TxPP QxtlS0DhoCNGRqXiZsjJaAm7LJqogbfDe1tK9E+m7K0EQez8irECkKme8C9zIL4rR1kdYBR064vhD eYY9o9Pq0RZDb+MMLcXr0+8Id3VySYtNYZjC2JElNzxpp+M/0JA99bmPe3626de5nqnI=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To: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:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Uw/wdFN5Gv9qIychUKt8dUUOMxFU43zN1NH1mlpfHYQ=; b=ckUOIA6knjOdhOm68Zr8vihvaV Vje1E4q9JKiT1XClhc/PSc2Sai3ALf180FbYsex6g0AMOod6oYgnXy2WW+w5AoDPuINjYwDXo4lec 1/WGPNcN+oZg4gooYbn+CHZNAgjEKNm+rmj663mXaAIzXnUzlwVThuiEa81sclcb0aA8=; Received: from mail-wm0-f53.google.com ([74.125.82.53]) by sfi-mx-3.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1f2yH6-005sIT-4d for openvpn-devel@lists.sourceforge.net; Mon, 02 Apr 2018 12:09:27 +0000 Received: by mail-wm0-f53.google.com with SMTP id r131so26626858wmb.2 for ; Mon, 02 Apr 2018 05:09:23 -0700 (PDT) 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:in-reply-to:references; bh=Uw/wdFN5Gv9qIychUKt8dUUOMxFU43zN1NH1mlpfHYQ=; b=IIv+DiMxwuqqpSKqYZihDwZXpmn3RvRI6f92mNO7BWZdoQA4MqPiSQ2EUm06yzoJRa kNoNsC1lbUFftj5+ek85CoJteMbl9qMcVgyOUpPirN0OJ+W1ylHwB1gJlYVR7X4mHJOy O2J7rs6MeD+FI03uc0fIj3AqFn8LeRkVWT5eIzz7BYlA4oATn4npt5YovSFVkW6h7E9c HXRybjoIXJINhSMuY1WPqNHnUNCU90ZhmqRkTpYqKKbJt9QoWdh4vrc0ZN1hvogL2uQq fziES/6e4hKkrtJU7Jshuxi6o3cVHVa4ajpkBXoZ1ruuGtveFlRHgOld1fGetbTrhe7L 7XHg== 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:in-reply-to :references; bh=Uw/wdFN5Gv9qIychUKt8dUUOMxFU43zN1NH1mlpfHYQ=; b=IWTlFk9Rb25+JiYNK3Ehz7ItZDW86afwdJhY8fetKCp2Ith3ggCjNAZzrk8D/21t4O /7+B17f6wAAA2VkOWL+XmDaXcEV7Cg2+V5HMFLekKGcjsToHDPDLrvV+fGc7CQSyhcYI LtMPLiCMewSwLncdu7t4IdHtWbGyohL4g84bYnHWCd6jw5QOFwgfta3MC+SAH8DvQapq 9aop/OQqZh2Igmz+lXU6tpOEq0KemIeKn8+wX384Uko289hINg+mXWiNQYqiugLmZA0T EDcJ7hFufhpUpdJbNQSP8YgqWho6lQF5duYSgMTcpiM4Bpx4pjMweqBXSCfvEW36i5LX Wepg== X-Gm-Message-State: AElRT7GncjXG8OUDbiaFJGu2uNnGL088jyg5wSItw7eFyL8Dk444k8aA EZEWNWfjNE3dc3KCETzROutCYSmsR8s= X-Google-Smtp-Source: AIpwx4/OBlh57GNuU/ARFNTGHbJSwVMjnuQIYDvJrfENuJWYHk2Jyf70RWM23QulDYFLBPkeRIlLHw== X-Received: by 10.80.184.198 with SMTP id l64mr12482303ede.5.1522669483305; Mon, 02 Apr 2018 04:44:43 -0700 (PDT) Received: from vesta.fritz.box ([2001:985:e54:1:9c71:8e2b:6423:3d47]) by smtp.gmail.com with ESMTPSA id m8sm264133edi.16.2018.04.02.04.44.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Apr 2018 04:44:42 -0700 (PDT) From: Steffan Karger To: openvpn-devel@lists.sourceforge.net Date: Mon, 2 Apr 2018 13:44:36 +0200 Message-Id: <20180402114436.13662-1-steffan@karger.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: 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 [74.125.82.53 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.53 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 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 -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1f2yH6-005sIT-4d Subject: [Openvpn-devel] [PATCH v3] Improve management-external-key/cert error 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 Check the return values of management_query_cert() and tls_ctx_use_external_private_key(), and error out with a more descriptive error message. To do so, we make the openssl-backed implementation of tls_ctx_use_external_private_key() not throw fatal error anymore. (And fix line wrapping while touching this code.) Signed-off-by: Steffan Karger --- v2: error out with M_FATAL as suggested by Selva. v3: rebase on master (without extra patches) src/openvpn/ssl.c | 28 ++++++++++++++++++++-------- src/openvpn/ssl_openssl.c | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 669f941b..b06820ba 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -660,18 +660,30 @@ init_ssl(const struct options *options, struct tls_root_ctx *new_ctx) else if ((options->management_flags & MF_EXTERNAL_KEY) && (options->cert_file || options->management_flags & MF_EXTERNAL_CERT)) { - if (options->cert_file) + if (options->cert_file + && 0 != tls_ctx_use_external_private_key(new_ctx, + options->cert_file, + options->cert_file_inline)) { - tls_ctx_use_external_private_key(new_ctx, options->cert_file, - options->cert_file_inline); + msg(M_FATAL, "Failed to initialize management-external-key"); } else { - char *external_certificate = management_query_cert(management, - options->management_certificate); - tls_ctx_use_external_private_key(new_ctx, INLINE_FILE_TAG, - external_certificate); - free(external_certificate); + char *external_cert = management_query_cert( + management, options->management_certificate); + + if (!external_cert) + { + msg(M_FATAL, "Failed to initialize management-external-cert"); + } + + if (0 != tls_ctx_use_external_private_key(new_ctx, INLINE_FILE_TAG, + external_cert)) + { + msg(M_FATAL, "Failed to initialize management-external-key"); + } + + free(external_cert); } } #endif diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 8ef68ebd..4d434fa2 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -1330,7 +1330,7 @@ tls_ctx_use_external_private_key(struct tls_root_ctx *ctx, return 0; err: - crypto_msg(M_FATAL, "Cannot enable SSL external private key capability"); + crypto_msg(M_WARN, "Cannot enable SSL external private key capability"); return 1; }