From patchwork Sun Jan 14 08:44:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 187 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director2.mail.ord1d.rsapps.net ([172.27.255.50]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id MxunOm+zW1pnNwAAgoeIoA for ; Sun, 14 Jan 2018 14:45:52 -0500 Received: from proxy11.mail.iad3a.rsapps.net ([172.27.255.50]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id KV8dE2+zW1rMLgAAgYhSiA ; Sun, 14 Jan 2018 14:45:52 -0500 Received: from smtp31.gate.iad3a ([172.27.255.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy11.mail.iad3a.rsapps.net (Dovecot) with LMTP id mtP/L2+zW1rqRwAAxCvdqw ; Sun, 14 Jan 2018 14:45:51 -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.34.181.88] Authentication-Results: smtp31.gate.iad3a.rsapps.net; iprev=pass policy.iprev="216.34.181.88"; 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-Classification-ID: 868da852-f963-11e7-a936-bc305bf59894-1-1 Received: from [216.34.181.88] ([216.34.181.88:9150] helo=lists.sourceforge.net) by smtp31.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.1.56364 r(Core:4.2.1.14)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 8F/6E-29476-F63BB5A5; Sun, 14 Jan 2018 14:45:51 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1eaoD2-0004NS-HV; Sun, 14 Jan 2018 19:44:48 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.194] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eaoD0-0004NL-VS for openvpn-devel@lists.sourceforge.net; Sun, 14 Jan 2018 19:44:46 +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=fW442QIeT2mEE/OnNbjthT3i2Fs4Rd8nDKhK1hbNcxA=; b=OjeOwItCcGNLkPjnLZGwO/+JOb 1j144RO5ezdUpuYc7yBlrBKxOYqCJPzzodxNRfmXSiu3lLY0DWkxVICAYV42yjjYs+BWDp+q92f4m gwKTeQSzGrhy/dIXvZfKdVB/88aVzqJUSOCIjPjMoKc4Bad12R46C4+We2eVHkb9Q9+0=; 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=fW442QIeT2mEE/OnNbjthT3i2Fs4Rd8nDKhK1hbNcxA=; b=Team3d4gHNhsJAQ6GcD8Cnk+qE 0yzY2Q9DhpsuKGEukGMY7RvBQBGkMSeERMOuoRs6Ic6SAP83CzkqO8EcC7I99xLUAWnzr4Dk52k+t P72DE3KByDiAcjkwv1bwNfrjvzQ0zrooK0XDlXxsJTnRgJvBlPNC2TuExhLjghPaYnO8=; Received: from mail-it0-f66.google.com ([209.85.214.66]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1eaoCz-0000rI-1b for openvpn-devel@lists.sourceforge.net; Sun, 14 Jan 2018 19:44:46 +0000 Received: by mail-it0-f66.google.com with SMTP id b77so14500978itd.0 for ; Sun, 14 Jan 2018 11:44:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fW442QIeT2mEE/OnNbjthT3i2Fs4Rd8nDKhK1hbNcxA=; b=LaITuCnZvbhtq1hXg8sGJJ7ntpilSoIr0hPCdDSPoE3gEE5HqCNn8r2XbhX3E8oOkB yBqo1kr/IM82WUuK/KDKqQJKwxnG9eF+4ebFjrO2U+yFQok+d/0nvzdzP7AOO8yA9GgW U/mc5r9Hg7yAKUOtOQaXANe0WJLCnNY5RXJlYoU98pUGqotqHbSpvIUeZ5pj5GvBNSbA 0EcmCYFdX+OnFk8+LiFGktdgbAFg2qf4XGISo42xXpl0d9n4wZYQtxHDgpM354PAHOwo J3ZU7dqjeQOpn+Ffj2BI7TaPrgX3Y4TH2wstO5sEvniBOBLSWH8I1gd05aFuGMRNxWmt rHTw== 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=fW442QIeT2mEE/OnNbjthT3i2Fs4Rd8nDKhK1hbNcxA=; b=qoVpz5aExQuJgqQhjZL/Im0f4GpP7YMCrNlVic8yFNp/ZDPWPz2fgO6nh/NupDEh/m 1BtlJr9GYv3baJIoFIIgOoIggj2VXLnMEHrI8y8pQEJ4T+Xa1+sb6ls9/YMHUttsnkHu TGotSP8/ybf4u3XEAB820bdWrXNIWHs8nZKFIeYbzR8UgMz5aYvxIyWDDDRk3lzDSrIm e4UfkawyFjtTjEmCtZEc4kVXY8pbrB7/yL3jfobuDcNJb0B5lMjiRXJ5kMw3quVj/fUs kgmVNehFzpCYxfV7Pv1fo6xyOqfkdIPRwxJ7zNnA3vm42eqnrSoFf7zIcVTmGEScJ3tn KR+Q== X-Gm-Message-State: AKwxytcCz3H8SdW9iao1H0djkWjUrN3wKXM4jH5HLFwPvUz89G71S94Q bCUwwXh5/e7wGUqBUK1sGcp14wOe X-Google-Smtp-Source: ACJfBotX5T17TCWZVgyTSnX70njz7VUzsb2tIrDSJg4TUJph774UX5O+d+rH8m7Hojb/W7rQ4iDagw== X-Received: by 10.36.124.18 with SMTP id a18mr12520104itd.47.1515959079612; Sun, 14 Jan 2018 11:44:39 -0800 (PST) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.215.92]) by smtp.gmail.com with ESMTPSA id y64sm15244286ioy.25.2018.01.14.11.44.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Jan 2018 11:44:39 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Sun, 14 Jan 2018 14:44:31 -0500 Message-Id: <1515959073-10376-2-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1515959073-10376-1-git-send-email-selva.nair@gmail.com> References: <1515959073-10376-1-git-send-email-selva.nair@gmail.com> 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.214.66 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (selva.nair[at]gmail.com) -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 0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1eaoCz-0000rI-1b Subject: [Openvpn-devel] [PATCH 1/3] Refactor ssl_openssl.c in prep for external EC key support 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: Selva Nair - Move setting of key method callbacks into a function No change in functionality. Signed-off-by: Selva Nair Acked-By: Arne Schwabe --- src/openvpn/ssl_openssl.c | 65 ++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index d6d9acf..c29dbcf 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -1063,20 +1063,17 @@ done: return ret; } -int -tls_ctx_use_external_private_key(struct tls_root_ctx *ctx, - const char *cert_file, const char *cert_file_inline) +static int +tls_ctx_use_external_rsa_key(struct tls_root_ctx *ctx, EVP_PKEY *pkey) { RSA *rsa = NULL; RSA *pub_rsa; RSA_METHOD *rsa_meth; - X509 *cert = NULL; ASSERT(NULL != ctx); - tls_ctx_load_cert_file_and_copy(ctx, cert_file, cert_file_inline, &cert); - - ASSERT(NULL != cert); + pub_rsa = EVP_PKEY_get0_RSA(pkey); + ASSERT(NULL != pub_rsa); /* allocate custom RSA method object */ rsa_meth = RSA_meth_new("OpenVPN external private key RSA Method", @@ -1098,18 +1095,6 @@ tls_ctx_use_external_private_key(struct tls_root_ctx *ctx, goto err; } - /* get the public key */ - EVP_PKEY *pkey = X509_get0_pubkey(cert); - ASSERT(pkey); /* NULL before SSL_CTX_use_certificate() is called */ - pub_rsa = EVP_PKEY_get0_RSA(pkey); - - /* Certificate might not be RSA but DSA or EC */ - if (!pub_rsa) - { - crypto_msg(M_WARN, "management-external-key requires a RSA certificate"); - goto err; - } - /* initialize RSA object */ const BIGNUM *n = NULL; const BIGNUM *e = NULL; @@ -1118,8 +1103,10 @@ tls_ctx_use_external_private_key(struct tls_root_ctx *ctx, RSA_set_flags(rsa, RSA_flags(rsa) | RSA_FLAG_EXT_PKEY); if (!RSA_set_method(rsa, rsa_meth)) { + RSA_meth_free(rsa_meth); goto err; } + /* from this point rsa_meth will get freed with rsa */ /* bind our custom RSA object to ssl_ctx */ if (!SSL_CTX_use_RSAPrivateKey(ctx->ctx, rsa)) @@ -1127,15 +1114,10 @@ tls_ctx_use_external_private_key(struct tls_root_ctx *ctx, goto err; } - X509_free(cert); RSA_free(rsa); /* doesn't necessarily free, just decrements refcount */ return 1; err: - if (cert) - { - X509_free(cert); - } if (rsa) { RSA_free(rsa); @@ -1147,6 +1129,41 @@ err: RSA_meth_free(rsa_meth); } } + return 0; +} + +int +tls_ctx_use_external_private_key(struct tls_root_ctx *ctx, + const char *cert_file, const char *cert_file_inline) +{ + X509 *cert = NULL; + + ASSERT(NULL != ctx); + + tls_ctx_load_cert_file_and_copy(ctx, cert_file, cert_file_inline, &cert); + + ASSERT(NULL != cert); + + /* get the public key */ + EVP_PKEY *pkey = X509_get0_pubkey(cert); + ASSERT(pkey); /* NULL before SSL_CTX_use_certificate() is called */ + X509_free(cert); + + if (EVP_PKEY_get0_RSA(pkey)) + { + if (!tls_ctx_use_external_rsa_key(ctx, pkey)) + { + goto err; + } + } + else + { + crypto_msg(M_WARN, "management-external-key requires a RSA certificate"); + goto err; + } + return 1; + +err: crypto_msg(M_FATAL, "Cannot enable SSL external private key capability"); return 0; }