From patchwork Fri Jan 12 10:37:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Deloget X-Patchwork-Id: 180 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director1.mail.ord1d.rsapps.net ([172.30.191.6]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id NA3HF/EqWVpRTAAAgoeIoA for ; Fri, 12 Jan 2018 16:38:57 -0500 Received: from proxy7.mail.ord1d.rsapps.net ([172.30.191.6]) by director1.mail.ord1d.rsapps.net (Dovecot) with LMTP id B4ucDfEqWVoUUwAANGzteQ ; Fri, 12 Jan 2018 16:38:57 -0500 Received: from smtp22.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy7.mail.ord1d.rsapps.net (Dovecot) with LMTP id mCqaI/EqWVqwFgAAMe1Fpw ; Fri, 12 Jan 2018 16:38:57 -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: smtp22.gate.ord1d.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=none (p=nil; dis=none) header.from=free.fr X-Classification-ID: fe6f480a-f7e0-11e7-8e0c-5254001a15c2-1-1 Received: from [216.34.181.88] ([216.34.181.88:24948] helo=lists.sourceforge.net) by smtp22.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 88/1C-00465-1FA295A5; Fri, 12 Jan 2018 16:38:57 -0500 Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.89) (envelope-from ) id 1ea71n-00012u-B4; Fri, 12 Jan 2018 21:38:19 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.194] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1ea71m-00012o-Aj for openvpn-devel@lists.sourceforge.net; Fri, 12 Jan 2018 21:38:18 +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=/aWWh4g0/dvHyYxdLekBkM8C2n1mCJdK/YUWBhl0L5M=; b=RgdBZJSc32sQJlv5j5/HGUJA2F GD4REzIAH+mmpqsjGFfJ+RC8xUCqWdpP+ETopAWAzYCC8PJYGt4/58hSRYvPBaD+p/4BAeNr9QpN7 M/mvi91Xtg83/F8Ym7hhcR86L6K4sAWCUloWP3uxuwjCnfU+bByeEQ3cDWe6t5jqXCWY=; 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=/aWWh4g0/dvHyYxdLekBkM8C2n1mCJdK/YUWBhl0L5M=; b=mFsqmZZvfYrLA0b85ZnAnG+bI1 68rI89CAXOhSc08P7wiaxjYklxKn5B1LVEGkZtluujIHkyIpo5kIxOyaRKvHAJJhanGL8g1ShYlXX VBNFe96XJxAFzz70OZ6aeAEXXVuJy6KtiCeEV24REutiOssanhJkBPuKWkst2zTWQEnc=; Received: from mail-wr0-f193.google.com ([209.85.128.193]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1ea71l-0003Eh-A3 for openvpn-devel@lists.sourceforge.net; Fri, 12 Jan 2018 21:38:18 +0000 Received: by mail-wr0-f193.google.com with SMTP id o7so6452282wro.8 for ; Fri, 12 Jan 2018 13:38:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/aWWh4g0/dvHyYxdLekBkM8C2n1mCJdK/YUWBhl0L5M=; b=aSmFOuit1lZr+ybSOG5CdmIRAI2BxR5YYWAq5G6g3QkJyCQ4c76NJc3+1jFzGiIHDs gN/JOIFK+1dSMeHC2MoEAL5fCwt0E72l6jdihofyMPrz4hSGvjcQwDtOWCoOnAKE24K/ EmUw8Uv3nNpKHlZx5t7ikpVYZVHna1TXQmuXaRE64baNG4ne3dPxscmyXsG5Djybnqa1 /o9lv6lA2IZT0UMSPBmQyiKAvGPQJ384ecShdyC+yhIKQ/XrzIXK1iX8mVKxlruth/eM jX63n53dLfLhzZ1XNJeK0b+2hXQ0ZhDWpFxwKD5GGkkFfHUN896msYSKMXvNzggk+h7M kSpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=/aWWh4g0/dvHyYxdLekBkM8C2n1mCJdK/YUWBhl0L5M=; b=hvlQAOJqtB1akGCjHNsqc6FfUgnDAO15YE54rIZb6miCmWnKNoz/MtDgGXr6IIAYLm mkxvAAWGhTLJ31UkiWjWpWlpEB5B6ZmEWE+Zh+kChO7B6DbYzGnsDSX3oVgOevI9gnI/ 9n5EoRdZHD8g1p4koiqtumFHYZ0UwfmUNXs2vE0jE6zYqzmE1txjdJW+sYmrLEslo8ZL qDnqPU2dWgLxtDoUJxL0OGIqdBzvj5neE8GuoDeg7DHsKQT4h4ByBgsaKeCN3xhKxYUF WLD4vXATbxZoZsdz4gpjzJTwzqSJxvG0uyFfZOZ5c56t1odlaRYYQL+iSRDOy0x1zKIL XqQA== X-Gm-Message-State: AKGB3mIvam0qjfOQkLc5fk2aMtKLNZLZxE3HxnSngu0tE9BSfpobm5RG y8n44iYk+PB5ai3ReMz4bRSX0/SF X-Google-Smtp-Source: ACJfBotsqM/VqGoCu1VaoS8fF6bYoeGvx9XmEb5Z43hYYqMGuzsbVmwnAN7tzdzffkK7q3AwCsrR9g== X-Received: by 10.223.132.70 with SMTP id 64mr24725901wrf.142.1515793090994; Fri, 12 Jan 2018 13:38:10 -0800 (PST) Received: from localhost.localdomain ([2a01:cb1c:809d:a300:b475:8426:18a9:8aa1]) by smtp.gmail.com with ESMTPSA id v75sm4490582wrc.45.2018.01.12.13.38.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 13:38:10 -0800 (PST) From: Emmanuel Deloget To: openvpn-devel@lists.sourceforge.net Date: Fri, 12 Jan 2018 22:37:52 +0100 Message-Id: <6a6ede658da2e35b718a9ccb733b132a955ffefe.1515792908.git.logout@free.fr> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: 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 (logout[at]free.fr) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.128.193 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (emmanueldeloget53[at]gmail.com) 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 X-Headers-End: 1ea71l-0003Eh-A3 Subject: [Openvpn-devel] [PATCH v2 2/3] OpenSSL: remove some EVP_PKEY type checks 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 Calling EVP_KEY_id() before EVP_PKEY_get0_*() is unnecessary as the same check is also performed in the later. We also make the code a bit better by not calling the various EVP_PKEY_get0_*() functions twice (this needs a bit or reordering to avoid introducing yet another #ifndef OPENSSL_NO_EC in the code). Signed-off-by: Emmanuel Deloget diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index 711bba11..7943fb2c 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -1699,22 +1699,13 @@ print_details(struct key_state_ssl *ks_ssl, const char *prefix) EVP_PKEY *pkey = X509_get_pubkey(cert); if (pkey != NULL) { - if ((EVP_PKEY_id(pkey) == EVP_PKEY_RSA) && (EVP_PKEY_get0_RSA(pkey) != NULL)) - { - RSA *rsa = EVP_PKEY_get0_RSA(pkey); - openvpn_snprintf(s2, sizeof(s2), ", %d bit RSA", - RSA_bits(rsa)); - } - else if ((EVP_PKEY_id(pkey) == EVP_PKEY_DSA) && (EVP_PKEY_get0_DSA(pkey) != NULL)) - { - DSA *dsa = EVP_PKEY_get0_DSA(pkey); - openvpn_snprintf(s2, sizeof(s2), ", %d bit DSA", - DSA_bits(dsa)); - } + RSA *rsa = NULL; + DSA *dsa = NULL; #ifndef OPENSSL_NO_EC - else if ((EVP_PKEY_id(pkey) == EVP_PKEY_EC) && (EVP_PKEY_get0_EC_KEY(pkey) != NULL)) + EC_KEY *ec = NULL; + + if ((ec = EVP_PKEY_get0_EC_KEY(pkey)) != NULL) { - EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey); const EC_GROUP *group = EC_KEY_get0_group(ec); const char* curve; @@ -1726,9 +1717,19 @@ print_details(struct key_state_ssl *ks_ssl, const char *prefix) openvpn_snprintf(s2, sizeof(s2), ", %d bit EC, curve: %s", EC_GROUP_order_bits(group), curve); - - } + } else #endif + if ((rsa = EVP_PKEY_get0_RSA(pkey)) != NULL) + { + openvpn_snprintf(s2, sizeof(s2), ", %d bit RSA", + RSA_bits(rsa)); + } + else if ((dsa = EVP_PKEY_get0_DSA(pkey)) != NULL) + { + openvpn_snprintf(s2, sizeof(s2), ", %d bit DSA", + DSA_bits(dsa)); + } + EVP_PKEY_free(pkey); } X509_free(cert);