From patchwork Thu Apr 8 03:36:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1726 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.56]) by backend30.mail.ord1d.rsapps.net with LMTP id UO34FDQHb2AeQgAAIUCqbw (envelope-from ) for ; Thu, 08 Apr 2021 09:37:56 -0400 Received: from proxy3.mail.iad3a.rsapps.net ([172.27.255.56]) by director8.mail.ord1d.rsapps.net with LMTP id mGbOFDQHb2BWGQAAfY0hYg (envelope-from ) for ; Thu, 08 Apr 2021 09:37:56 -0400 Received: from smtp26.gate.iad3a ([172.27.255.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy3.mail.iad3a.rsapps.net with LMTPS id 8LjaDTQHb2A8DgAAYaqY3Q (envelope-from ) for ; Thu, 08 Apr 2021 09:37:56 -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: smtp26.gate.iad3a.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; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 9f5bfd76-986f-11eb-a185-52540063aac2-1-1 Received: from [216.105.38.7] ([216.105.38.7:35438] helo=lists.sourceforge.net) by smtp26.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 1E/52-11754-3370F606; Thu, 08 Apr 2021 09:37:55 -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 1lUUq1-00081H-SW; Thu, 08 Apr 2021 13:36:49 +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 1lUUpz-00080q-PV for openvpn-devel@lists.sourceforge.net; Thu, 08 Apr 2021 13:36:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: 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=3vzjBHSxJRVECwotou1JMaGOTNtTOKrHS07W0iKIRf8=; b=hxOt1AgSzIQ38PRqJTe/9L6ynD gmTqlQAKV+ScpYloKQ6UKRPvlY3PBeW9CUXAtrx9Ocpof4HBetw2Egsk+EHzvmBbE1o3Lwu1Ss+/t mV/oxllDW7VwFCfxW2KJYhl4RPUECEMr4KwPV3DG70A3bXRXWpYSULh2SB4ICjshSxx8=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc: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=3vzjBHSxJRVECwotou1JMaGOTNtTOKrHS07W0iKIRf8=; b=Fz6K4WMgfNrqBJn833pnFtiwIr dCcL6myZQdN4mGwngOswvk3pE1IsRcSlnx4zSalx31x8pFQUdOgTTRuQxQACmlosFKO3WjB8t5kvl nA5Bqg6/Zuec0ntLOmyAW7oZR39pBaNg8IXHHETwKmS2xAWtQcqwJANPamosOfh53XXQ=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lUUpm-004jLu-1m for openvpn-devel@lists.sourceforge.net; Thu, 08 Apr 2021 13:36:47 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lUUpe-000DT8-PF for openvpn-devel@lists.sourceforge.net; Thu, 08 Apr 2021 15:36:26 +0200 Received: (nullmailer pid 29277 invoked by uid 10006); Thu, 08 Apr 2021 13:36:26 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 8 Apr 2021 15:36:26 +0200 Message-Id: <20210408133626.29232-1-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1lUUpm-004jLu-1m Subject: [Openvpn-devel] [PATCH] Ensure using const variables with EVP_PKEY_get0_* 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 These functions return const pointers in OpenSSL 3.0.0alpha14, so our pointers should be also const to avoid casting the const away. Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli --- src/openvpn/ssl_openssl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c index cb8ac7727..a9bc342b0 100644 --- a/src/openvpn/ssl_openssl.c +++ b/src/openvpn/ssl_openssl.c @@ -1248,12 +1248,11 @@ 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; ASSERT(NULL != ctx); - pub_rsa = EVP_PKEY_get0_RSA(pkey); + const RSA *pub_rsa = EVP_PKEY_get0_RSA(pkey); ASSERT(NULL != pub_rsa); /* allocate custom RSA method object */ @@ -2031,7 +2030,7 @@ print_cert_details(X509 *cert, char *buf, size_t buflen) #ifndef OPENSSL_NO_EC if (typeid == EVP_PKEY_EC && EVP_PKEY_get0_EC_KEY(pkey) != NULL) { - EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey); + const EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey); const EC_GROUP *group = EC_KEY_get0_group(ec); int nid = EC_GROUP_get_curve_name(group);