From patchwork Mon Apr 2 18:30:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 288 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net (Dovecot) with LMTP id m3/2HtQDw1rdFgAAIUCqbw for ; Tue, 03 Apr 2018 00:32:20 -0400 Received: from proxy13.mail.ord1d.rsapps.net ([172.30.191.6]) by director8.mail.ord1d.rsapps.net (Dovecot) with LMTP id pyGtEdQDw1qsSwAAfY0hYg ; Tue, 03 Apr 2018 00:32:20 -0400 Received: from smtp11.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy13.mail.ord1d.rsapps.net with LMTP id gBChHtQDw1ppSgAAgjf6aA ; Tue, 03 Apr 2018 00:32:20 -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: smtp11.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: fec0e9b6-36f7-11e8-bc15-5254005f837b-1-1 Received: from [216.105.38.7] ([216.105.38.7:25810] helo=lists.sourceforge.net) by smtp11.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 4D/96-03820-3D303CA5; Tue, 03 Apr 2018 00:32:20 -0400 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 1f3DbG-0001Sk-U9; Tue, 03 Apr 2018 04:31:14 +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 1f3DbG-0001SZ-5j for openvpn-devel@lists.sourceforge.net; Tue, 03 Apr 2018 04:31:14 +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=Ky1/ZnPnn0S4IXVStP53ur3EAGsXWY2X4ZiOY8ODMmQ=; b=VWEmG4WXysdNkKqqGBjd6rQpuo WqFX9Wo9u0WrUAF+GBfDCbcbj5dBXm3Yozr3L5NQwa9Jd6SQbbYOCHH8+WZiG3uB+GqhiLqoC5joq PRheqKAulscBtFyfQ6JPDw6zjDwNgcR+o1+/RDVFq/ysJOWELeQRcEA25gDKsxjWCEfQ=; 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=Ky1/ZnPnn0S4IXVStP53ur3EAGsXWY2X4ZiOY8ODMmQ=; b=JuSttJ79bdSutMu+9w/lthnGfv F8Ay2c1FcvHum8/eoMB2BI2LD9ZzVOd+Dl/nDxDySg/MQpUZ+IgZMX2C3Sxb6t3AH+tGH1XEpkXCd 5CN3lBWnFZCXDfz4b9M80VlIYCzZZODIgyf+B94vi8ptwvEzwXhR2+aGkgZfJUqK9joE=; Received: from mail-it0-f65.google.com ([209.85.214.65]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1f3DbE-009yW4-MV for openvpn-devel@lists.sourceforge.net; Tue, 03 Apr 2018 04:31:14 +0000 Received: by mail-it0-f65.google.com with SMTP id 71-v6so18988252ith.2 for ; Mon, 02 Apr 2018 21:31:12 -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:in-reply-to:references; bh=Ky1/ZnPnn0S4IXVStP53ur3EAGsXWY2X4ZiOY8ODMmQ=; b=LwbD6O6YC3X+zRqVXSTuEWeJPUwu/AnPHepwepriO+jMScM8dlFr3Ia1HHMv5i7j8+ yf8sURfCWOqVnrgIhuvnueNlgKZSR1CF3BvaiB50uY0efUV4Vtd9VnBQ/+8//XltTSZP XuUgrl+vTr+Qdeo7h3xPQ+v4skQiQ+cJpSqOLZ4uQubDsrLIoWCTaNFBjC5hwRKR/aPi CauqmPx3K5qOjpqHPDjhpBxgb5sYCZ8CL5DRJDWgAoVhXFFoS94nL9EvMJEksSDtWzib bCuSzhRdszXCWDbLqJgpM8YTg3xavFXzid+8DlX0qjsPpDIhEL2UVKOhGFMBT435ARSZ C17g== 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=Ky1/ZnPnn0S4IXVStP53ur3EAGsXWY2X4ZiOY8ODMmQ=; b=cSP92Q5CrzMIcYMe2Sti355CwIJpFVKxU7x0uXI6ex1E1UlVbDCHU6/u06/dnMWyCb qj1CLDjirmWv0/qqFIgxZNg8n+fMbCjE9M1/qX7Cua7bpJDZ7ma2ymYHEmMfzjRGhN9W Zxxw1ksPBT17FowglYbXYY7/3f3eHxIJzVbzTwBcDQVDXZ4aqPcds2jX/7WcvBbmsLvJ 7ifBHY7x3wFM97W82TOlgkMZ5MPXzFoH6hb2rQemDtV8RFZhKHqUptqaLXjGaf74W+wW oIhg5hjPOrvwNnlQfw29vpHqgFoFEEgVZ9dxHx9tOPXxtyyz4SSH1SXaFWUgA16ac28F Gq6A== X-Gm-Message-State: AElRT7GPZbh46MoDC21wknzwMmHSGU/HwWU2zzJ2qo66j3cFFl2WnS65 gfK58jxvp9eEz8YDCow6kgpeTsuM X-Google-Smtp-Source: AIpwx496tTlfHhD7wnDnGk+KjfusGDVhNsSvliLAqvPlG1txajucnPymaaaeTMNZ6ZWGY3j0HrN1Rw== X-Received: by 2002:a24:624b:: with SMTP id d72-v6mr3766300itc.70.1522729866843; Mon, 02 Apr 2018 21:31:06 -0700 (PDT) Received: from saturn.home.sansel.ca (CPE40167ea0e1c2-CM788df74daaa0.cpe.net.cable.rogers.com. [99.228.215.92]) by smtp.gmail.com with ESMTPSA id a46-v6sm1176784itj.1.2018.04.02.21.31.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Apr 2018 21:31:06 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Tue, 3 Apr 2018 00:30:43 -0400 Message-Id: <1522729843-28878-2-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1522729843-28878-1-git-send-email-selva.nair@gmail.com> References: <1520817479-17203-1-git-send-email-selva.nair@gmail.com> <1522729843-28878-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 http://www.dnswl.org/, no trust [209.85.214.65 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.214.65 listed in wl.mailspike.net] -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 RCVD_IN_MSPIKE_WL Mailspike good senders X-Headers-End: 1f3DbE-009yW4-MV Subject: [Openvpn-devel] [PATCH v2 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 --- v2: rebased to v2 1/2 -- no code changes src/openvpn/cryptoapi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index ec7569a..c78e608 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -50,6 +50,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. @@ -608,12 +609,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)) { @@ -641,7 +643,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') { @@ -681,6 +683,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; }