From patchwork Mon May 24 08:45:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 1836 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 4HceNHn0q2DFUwAAIUCqbw (envelope-from ) for ; Mon, 24 May 2021 14:46:17 -0400 Received: from proxy6.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id UDUtNHn0q2B7HwAAovjBpQ (envelope-from ) for ; Mon, 24 May 2021 14:46:17 -0400 Received: from smtp30.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy6.mail.ord1d.rsapps.net with LMTPS id +DKXM3n0q2DXXwAAQyIf0w (envelope-from ) for ; Mon, 24 May 2021 14:46:17 -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: smtp30.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: 52785a98-bcc0-11eb-8519-5254001e8e38-1-1 Received: from [216.105.38.7] ([216.105.38.7:48132] helo=lists.sourceforge.net) by smtp30.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 4A/C4-00902-974FBA06; Mon, 24 May 2021 14:46:17 -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 1llFZv-0007U6-0G; Mon, 24 May 2021 18:45:27 +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 1llFZs-0007Tt-Mj for openvpn-devel@lists.sourceforge.net; Mon, 24 May 2021 18:45:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: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=apv7izEvTv/5jzkPugVkDzY/BLgiqxEsiLqB0sO16L8=; b=cqQhlbNaTJi9yWGagVK6BZ4+vq puUyTx5OggBizjQu6LgT6wuvOc5Tfx/R6ogQVTOYqVkhQxbGnrobS3Q7JwSoAb1Zpsb89LMbUT2Vd okHmznjti8cPU55Wq465FcMCs7WVSpBCmSkCUvlQ8xT5F5G2t41z2GKlB15wcFbHoiFA=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From :Sender:Reply-To:Content-Type: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=apv7izEvTv/5jzkPugVkDzY/BLgiqxEsiLqB0sO16L8=; b=g iEM/8xRzyS8Ggl1mj4C8WVl1yyBzQ5FI6XFpi7xpUZhgKfKrzob7fP8UdLcXTVnPviLJmmV93ozUp PScmpDY4D2qKB2XZIrfvl4QqoAgxdEvBAOwuj90i13Hoy5mURx6D1kwP0UUlli68R5sLc+VdhL+Qa h6OvdS9LxCaoEs4k=; Received: from mail-il1-f175.google.com ([209.85.166.175]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1llFZo-004TSv-3P for openvpn-devel@lists.sourceforge.net; Mon, 24 May 2021 18:45:27 +0000 Received: by mail-il1-f175.google.com with SMTP id b5so5895990ilc.12 for ; Mon, 24 May 2021 11:45:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=apv7izEvTv/5jzkPugVkDzY/BLgiqxEsiLqB0sO16L8=; b=J0384KQutoP5ou50G4xgHyNgKg8Wca5CJRGPAfI9J7A8d8aPwfyC0YMUOTuc65/VxV ZCiE6QgHhChDkmw1y9aGOAZh06cRNy5mz9DiOlIA5Ha1Hnj9DCh8eqaEL6UHAPnV381h JFPgiYvKDgyxujbyMxSL9MShesoaFTZTnpn1sbt4+duHn4rprre/atKgfIoNwB/RDu6M 8bRos5hpaHv897ww1jLuXNhLWJTlI7cX477M/7d8HIAFM4C2iHGsGumSERq221IbHdSX Ki0I8LOpknAZran3InL+DV/rH3SKjTVccqPuU/zUn2t+TC6u0nkdm+SV7g/9pfMW8Bu7 H4vA== 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:mime-version :content-transfer-encoding; bh=apv7izEvTv/5jzkPugVkDzY/BLgiqxEsiLqB0sO16L8=; b=Hbui/f+gAoCAONv/y5V6dLMPKTX1Ht4zxDeWz9W5kFJeu2ReoHj4oG1rNoA9fhNT8X vwVACnilyKi01fGkp4FiHgXp+I3efH8eD1hJqGV+sYdDkMe6RBJcLltA5xp0YYHNVWX0 ZV2vZ8qTISCLCTaD0pOjP1jGGFdioabpqwA6cQTVQLSw+JEtToLayGbF6vf+9b/1z0Il pPKCdf9xBKwe6MVzzRrNKrbIiqb+UTFyPHyW3J/AysOG1aoSmJNnyXtFTJKlmBmbCFn4 NhekTCvZS4XOM2ErhA/llTcI8495MQHECSGn9Dz+2CQomyI7Uuo4yKlxt/ZSFYOzx0ba XX2Q== X-Gm-Message-State: AOAM5314kl836Zvqxi+QyihWkmR9v94DdC6iSfU0kD/Xs8rElHDcSdaF ccTI3wdj/w/jxTHbQ5W2xaZQA90WmAEuxg== X-Google-Smtp-Source: ABdhPJzZkV2nq5JqRyVLl20pr2wcLGUZIHzhuIa5inxaQFcGGcQU0dSP03Lw2oLGtlM69b+NQalsMA== X-Received: by 2002:a92:cb42:: with SMTP id f2mr17004594ilq.71.1621881914252; Mon, 24 May 2021 11:45:14 -0700 (PDT) Received: from uranus.home.sansel.ca (bras-vprn-tnhlon4053w-lp130-01-70-51-222-236.dsl.bell.ca. [70.51.222.236]) by smtp.gmail.com with ESMTPSA id h11sm11737643ilo.72.2021.05.24.11.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 11:45:13 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Mon, 24 May 2021 14:45:06 -0400 Message-Id: <20210524184506.20582-1-selva.nair@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.175 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.175 listed in wl.mailspike.net] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -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 X-Headers-End: 1llFZo-004TSv-3P Subject: [Openvpn-devel] [PATCH] Do not require CA when peer-fingerprint is used 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: , Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox From: Selva Nair Fix --ca or --ca-path check when --pkcs11-id or --cryptoapicert is used with --peer-fingerprint. The multiple --ca or --capath checks are consolidated into a function Signed-off-by: Selva Nair Acked-By: Arne Schwabe --- src/openvpn/options.c | 44 ++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 5a6f37d7..8d417206 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2055,6 +2055,27 @@ connection_entry_preload_key(const char **key_file, bool *key_inline, } } +static void +check_ca_required(const struct options *options) +{ + if (options->verify_hash_no_ca + || options->pkcs12_file + || options->ca_file +#ifndef ENABLE_CRYPTO_MBEDTLS + || options->ca_path +#endif + ) + { + return; + } + + msg(M_USAGE, "You must define CA file (--ca)" +#ifndef ENABLE_CRYPTO_MBEDTLS + " or CA path (--capath)" +#endif + " and/or peer fingeprint verification " "(--peer-fingerprint)"); +} + static void options_postprocess_verify_ce(const struct options *options, const struct connection_entry *ce) @@ -2592,11 +2613,10 @@ options_postprocess_verify_ce(const struct options *options, if (options->tls_server || options->tls_client) { + check_ca_required(options); #ifdef ENABLE_PKCS11 if (options->pkcs11_providers[0]) { - notnull(options->ca_file, "CA file (--ca)"); - if (options->pkcs11_id_management && options->pkcs11_id != NULL) { msg(M_USAGE, "Parameter --pkcs11-id cannot be used when --pkcs11-id-management is also specified."); @@ -2657,10 +2677,6 @@ options_postprocess_verify_ce(const struct options *options, #ifdef ENABLE_CRYPTOAPI if (options->cryptoapi_cert) { - if ((!(options->ca_file)) && (!(options->ca_path))) - { - msg(M_USAGE, "You must define CA file (--ca) or CA path (--capath)"); - } if (options->cert_file) { msg(M_USAGE, "Parameter --cert cannot be used when --cryptoapicert is also specified."); @@ -2718,25 +2734,11 @@ options_postprocess_verify_ce(const struct options *options, else { #ifdef ENABLE_CRYPTO_MBEDTLS - if (!(options->ca_file || options->verify_hash_no_ca)) - { - msg(M_USAGE, "You must define CA file (--ca) and/or " - "peer fingeprint verification " - "(--peer-fingerprint)"); - } if (options->ca_path) { msg(M_USAGE, "Parameter --capath cannot be used with the mbed TLS version version of OpenVPN."); } -#else /* ifdef ENABLE_CRYPTO_MBEDTLS */ - if ((!(options->ca_file)) && (!(options->ca_path)) - && (!(options->verify_hash_no_ca))) - { - msg(M_USAGE, "You must define CA file (--ca) or CA path " - "(--capath) and/or peer fingeprint verification " - "(--peer-fingerprint)"); - } -#endif +#endif /* ifdef ENABLE_CRYPTO_MBEDTLS */ if (pull) {