From patchwork Fri Jul 26 10:39:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selva Nair X-Patchwork-Id: 788 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director9.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id SJD8JUhlO12lAgAAIUCqbw for ; Fri, 26 Jul 2019 16:40:40 -0400 Received: from proxy15.mail.ord1d.rsapps.net ([172.30.191.6]) by director9.mail.ord1d.rsapps.net with LMTP id QJuuJUhlO13OCQAAalYnBA ; Fri, 26 Jul 2019 16:40:40 -0400 Received: from smtp31.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 KBpcJUhlO12uAwAAAY1PeQ ; Fri, 26 Jul 2019 16:40:40 -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: smtp31.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: a134e514-afe5-11e9-8a14-525400b3ac8c-1-1 Received: from [216.105.38.7] ([216.105.38.7:54864] helo=lists.sourceforge.net) by smtp31.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 53/A9-24139-8456B3D5; Fri, 26 Jul 2019 16:40:40 -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 1hr70B-0006A8-8p; Fri, 26 Jul 2019 20:39:43 +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 1hr709-0006A0-Rw for openvpn-devel@lists.sourceforge.net; Fri, 26 Jul 2019 20:39:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=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:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=32NAj8Wx1HSKlSC91b7AoOi6wq9a6OasMBKIUU8JRug=; b=EfPC8XUx24ab2LhFviwhedqBrS f5PIdtiMlvYULywV4RUL+r6HpyulowL6Z06OfxpyQUTv23HOaiVoNWoPikiN1shShRX3o24J3HIrQ yFNbbQotYXyl5Bqsh2Pt8UJBIiLVIvu3vjrCQD3WYp0g8Kp22S4UC9orjQB+bkRZjx9I=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=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: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=32NAj8Wx1HSKlSC91b7AoOi6wq9a6OasMBKIUU8JRug=; b=NoORYXIQmXZSS1rQgSL2B6UCKy 7NAKA6KQ8DrvzNhgyWqsfb8YTHjJpQartk50opmXxVGSL/tMxDlnb1nQn8uMkE3L+LdcyFhS2gK1a ozW2QEQtVVod4LV+wnjfsLnRYt/8kyuCtnTpm2SplPU6ABrnSiqtFlqMXiAFVbLJJtgc=; Received: from mail-io1-f67.google.com ([209.85.166.67]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.90_1) id 1hr708-00HXFP-JR for openvpn-devel@lists.sourceforge.net; Fri, 26 Jul 2019 20:39:41 +0000 Received: by mail-io1-f67.google.com with SMTP id m24so107509427ioo.2 for ; Fri, 26 Jul 2019 13:39:40 -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; bh=32NAj8Wx1HSKlSC91b7AoOi6wq9a6OasMBKIUU8JRug=; b=HBOZXC8JcESxwtXcU5i49HZ072g+9mCDWRs2t2zoQ4rFKwOLWz5tT7bMzTbsUPz4Tv CXwiNr3dezxuYmqpyvdNkE3dxkW3Ku5kBH4hULoQOnNnV/iUVTddvRya/D8kiHRxCswV XQBFIzngmX0sI9evFO69RkHUlTTN+1Qmu+n8DTqjZ2qwU8tiTQE9YZKJRsvKdf13AvZg jYUfoT6XbHjPQ07NwdM45sxU3SkRYEpUcAXIUMZJRmwWpMkOWaZWRYEqi/mdPueT8FCo 6bKuhjvHugD5hyIZSPWd5NPLTbbx5UXguZhzaZxr7BlYbQ6gNHEYcK1nAkHc1LHL5MOy BbnQ== 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; bh=32NAj8Wx1HSKlSC91b7AoOi6wq9a6OasMBKIUU8JRug=; b=rUHS2jERFhKlF4bB57tPS9gHfpnZfrS47uhOO9j8O2CCAuC2U0i2cF/oHp744p1v3f O2WKVjEuR39A8IjEesxNVVHPzrDGnIh0rFxM97N+xG2SZCWlGpNdXEJ2UvuTPg+b+U9V Qz2kSB48PgA+tDMfPhPVYkE24c1Kx2iftZF21pS4FjDrNF+DtkuiJuRJM1lbbVyEL89J OT6ICS0+oy+OUg4ZJ+qdH6okp4SlLJI78dGr5R7hXiR9D7CqRhlpHU7oU1LXih4FeY3m WMg9jLYVOhxnS22nFMMvyr2AAifjwOGwMTMSg8D/ijU9P8J2OyiD6xvaBX4hmtBVmcVN VW9g== X-Gm-Message-State: APjAAAWW8p7CVvQUvXg0jiUeMhFLLHfgRMC8UcJHMjdkwHsYMcKdB153 RJnOoz5pzyyWD+bebvfZ+R4TeJBZ X-Google-Smtp-Source: APXvYqzfhGbn9NW6fqvL1KPS1Jg1ZMjrQG4ec3DgXG1fVP4ay/9k+Dr9C+J3FBxDDoCiuoK1hY1HVQ== X-Received: by 2002:a6b:4101:: with SMTP id n1mr63245870ioa.138.1564173574709; Fri, 26 Jul 2019 13:39:34 -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 h19sm36843172iol.65.2019.07.26.13.39.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Jul 2019 13:39:34 -0700 (PDT) From: selva.nair@gmail.com To: openvpn-devel@lists.sourceforge.net Date: Fri, 26 Jul 2019 16:39:17 -0400 Message-Id: <1564173557-11776-1-git-send-email-selva.nair@gmail.com> X-Mailer: git-send-email 2.1.4 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 https://www.dnswl.org/, no trust [209.85.166.67 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.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: 1hr708-00HXFP-JR Subject: [Openvpn-devel] [PATCH] Correct the return value of cryptoapi RSA signature callbacks 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 Fixes the wrong check on siglen instead of *siglen for signing failures. Bug reported by: lilulo Signed-off-by: Selva Nair Acked-by: Steffan Karger --- 2.4 will need a separate patch src/openvpn/cryptoapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openvpn/cryptoapi.c b/src/openvpn/cryptoapi.c index 0c11712e..2f2eee77 100644 --- a/src/openvpn/cryptoapi.c +++ b/src/openvpn/cryptoapi.c @@ -499,7 +499,7 @@ rsa_sign_CNG(int type, const unsigned char *m, unsigned int m_len, *siglen = priv_enc_CNG(cd, alg, m, (int)m_len, sig, RSA_size(rsa), cng_padding_type(padding), 0); - return (siglen == 0) ? 0 : 1; + return (*siglen == 0) ? 0 : 1; } /* decrypt */ @@ -973,7 +973,7 @@ pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, size_t *siglen, *siglen = priv_enc_CNG(cd, alg, tbs, (int)tbslen, sig, *siglen, cng_padding_type(padding), (DWORD)saltlen); - return (siglen == 0) ? 0 : 1; + return (*siglen == 0) ? 0 : 1; } #endif /* OPENSSL_VERSION >= 1.1.0 */