From patchwork Wed Feb 12 04:06:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 991 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.28.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id OMadE8UURF6sDgAAIUCqbw for ; Wed, 12 Feb 2020 10:07:49 -0500 Received: from proxy7.mail.ord1c.rsapps.net ([172.28.255.1]) by director7.mail.ord1d.rsapps.net with LMTP id gEBeE8UURF7HbAAAovjBpQ ; Wed, 12 Feb 2020 10:07:49 -0500 Received: from smtp38.gate.ord1c ([172.28.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1c.rsapps.net with LMTP id yEK1EsQURF6RVwAAknS3pQ ; Wed, 12 Feb 2020 10:07:49 -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: smtp38.gate.ord1c.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: 6d7f8636-4da9-11ea-b110-5452007bdf16-1-1 Received: from [216.105.38.7] ([216.105.38.7:38586] helo=lists.sourceforge.net) by smtp38.gate.ord1c.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 20/C5-19939-3C4144E5; Wed, 12 Feb 2020 10:07:47 -0500 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 1j1tbM-0006eg-MH; Wed, 12 Feb 2020 15:06:56 +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 1j1tbK-0006eO-On for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2020 15:06:54 +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=dqEQOasGUP4E3gBftoS4r2xEY3dYruVwlgGxxvaS7Pw=; b=A6r2+kGlYh8LNA2/whhJtXLwXp z3TSx2q6MxPTO0aQNdM2PvJzEhmM/5G0t0t6/F5UIWAPB6fE3NrkjDW4lAgCWqepmzcc9OZpRB9QS dI9LLaLTQEwucosJjrKuagcsI/5gVS9IVKz3BT4xyqL1SjjTGi5M6tB5j6Dqjgav0v7U=; 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=dqEQOasGUP4E3gBftoS4r2xEY3dYruVwlgGxxvaS7Pw=; b=KNOyXL2hs0OpQ24EQeqnXvrPyc bUSU8UC1ApsV5NPKV/DFD53nY89T7FECB31DU3LnB7yJ7+FKWQnUtCXEmzrJYSlhtl2pK7obd2lmk bxwAL3tF4d3IJwi3A2UTMLE0JXH4tsNws3ippiy8HvRLpBNT4/pMPmOlnRxfdRgLaa5o=; Received: from mail-qk1-f194.google.com ([209.85.222.194]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1j1tbI-009hFQ-Rd for openvpn-devel@lists.sourceforge.net; Wed, 12 Feb 2020 15:06:54 +0000 Received: by mail-qk1-f194.google.com with SMTP id w15so2334988qkf.6 for ; Wed, 12 Feb 2020 07:06:52 -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=dqEQOasGUP4E3gBftoS4r2xEY3dYruVwlgGxxvaS7Pw=; b=IxqArp3TNsX4VO6927GgLrtH3i4Q9OwgHNmELV7GEf+u5hejNQ2NjbTtVP7odkmax3 w3yahfKZ/kBSQATZu0zTdo4HU4Jw8s7QVsZOj8kbDjgvi5C+FU3Es4LZkH21bNJCIba8 NP1FrqWHO6gPmKgc230GUxnCkjG0v56/Tf+t7HmgjLyHPZwcSjgjgs0KlqVTkEAdJOsd RHFAWzGiKmVZdAMxycKTkNnE718Zh1SfF8F90ynr3lHD5RBdFKt/ltfLBcjdS+sWxnwJ PxnVMfkp14HVpd3BgYmK6wgRoLZf0EiYtzHr3lV/GIo3k1cf4g2Bo37EtEHw/w2qI3Ry IibQ== 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=dqEQOasGUP4E3gBftoS4r2xEY3dYruVwlgGxxvaS7Pw=; b=MPE90ZWWAvXg1nrVmxLAULZU+Zru2wMvkDq2pnc6bUqqecrG+c2yIjCcJEplEhz360 nq528qFpStx6ONEBBoKcl8oOHFEETaYQxLTmRr3IDDvlwHwQjizOgy8IDXajVXdomY+8 69Gx1W9qRhyVrNjd4RzpCrS2T2nxnftxoik5bo0E8FcRgj4MoOX/FadK8kyI1zNY2e3W VZcTfD/gSrxrrMa+cLZy1yh8cekXWzVTeW2XNLzb5eHb9j3WOQz0a7ZSGGgroy4LhA0K 6LDpjmP9wG2VlmsxoVtftnJsBXnLDpRfFWSyjCSQzLMQSkdI0rzQRoiGeq56SzH/eBq1 w4vw== X-Gm-Message-State: APjAAAXZm9BfS/9kk9E57T6g69y4acjRxkPKZ8xlzZrq56+lA9pvI1XN iksHTVRGRdyq5jjtLPlobKhDRjxL X-Google-Smtp-Source: APXvYqywDrvNMwONNQIESehSK6UPr7E9M+bhE93bhGnSVA+MrEXp6KAA1tWCpHKGBMogR8EJ9I8XMw== X-Received: by 2002:a05:620a:12c6:: with SMTP id e6mr10649286qkl.135.1581520006510; Wed, 12 Feb 2020 07:06:46 -0800 (PST) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.216.21]) by smtp.gmail.com with ESMTPSA id h14sm321646qke.99.2020.02.12.07.06.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Feb 2020 07:06:45 -0800 (PST) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Wed, 12 Feb 2020 10:06:07 -0500 Message-Id: <1581519967-16950-2-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1581519967-16950-1-git-send-email-selva.nair@gmail.com> References: <1581359742-30511-1-git-send-email-selva.nair@gmail.com> <1581519967-16950-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 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.222.194 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.222.194 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -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: 1j1tbI-009hFQ-Rd Subject: [Openvpn-devel] [PATCH v4 2/2] Allow unicode search string in --cryptoapicert option 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 Currently when the certificate is specified as "SUBJ:foo", the string foo is assumed to be ascii. Change that and interpret it as utf-8, convert to a wide string, and flag it as unicode in CertFindCertifcateInStore(). Signed-off-by: Selva Nair Acked-by: Lev Stipakov --- v4: matched to v4 of 1/2 src/openvpn/cryptoapi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index b9f1328..1bf74fc 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -51,6 +51,7 @@ #include "buffer.h" #include "openssl_compat.h" +#include "win32.h" /* MinGW w32api 3.17 is still incomplete when it comes to CryptoAPI while * MinGW32-w64 defines all macros used. This is a hack around that problem. @@ -746,12 +747,13 @@ find_certificate_in_store(const char *cert_prop, HCERTSTORE cert_store) const void *find_param; unsigned char hash[255]; CRYPT_HASH_BLOB blob = {.cbData = 0, .pbData = hash}; + struct gc_arena gc = gc_new(); if (!strncmp(cert_prop, "SUBJ:", 5)) { /* skip the tag */ - find_param = cert_prop + 5; - find_type = CERT_FIND_SUBJECT_STR_A; + find_param = wide_string(cert_prop + 5, &gc); + find_type = CERT_FIND_SUBJECT_STR_W; } else if (!strncmp(cert_prop, "THUMB:", 6)) { @@ -779,7 +781,7 @@ find_certificate_in_store(const char *cert_prop, HCERTSTORE cert_store) if (!*++p) /* unexpected end of string */ { msg(M_WARN, "WARNING: cryptoapicert: error parsing .", cert_prop); - return NULL; + goto out; } if (*p >= '0' && *p <= '9') { @@ -803,7 +805,7 @@ find_certificate_in_store(const char *cert_prop, HCERTSTORE cert_store) } else { msg(M_WARN, "WARNING: cryptoapicert: unsupported certificate specification <%s>", cert_prop); - return NULL; + goto out; } while(true) @@ -824,6 +826,8 @@ find_certificate_in_store(const char *cert_prop, HCERTSTORE cert_store) validity < 0 ? "not yet valid" : "that has expired"); } +out: + gc_free(&gc); return rv; }