From patchwork Fri Jan 12 05:48:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Deloget X-Patchwork-Id: 178 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director2.mail.ord1d.rsapps.net ([172.30.191.6]) by backend31.mail.ord1d.rsapps.net (Dovecot) with LMTP id G/tDDSTnWFrOMAAAgoeIoA for ; Fri, 12 Jan 2018 11:49:40 -0500 Received: from proxy20.mail.ord1d.rsapps.net ([172.30.191.6]) by director2.mail.ord1d.rsapps.net (Dovecot) with LMTP id gYg5ByTnWFoOEgAAgYhSiA ; Fri, 12 Jan 2018 11:49:40 -0500 Received: from smtp17.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy20.mail.ord1d.rsapps.net (Dovecot) with LMTP id CVPlACTnWFrAVQAAsk8m8w ; Fri, 12 Jan 2018 11:49:40 -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: smtp17.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: 946d159a-f7b8-11e7-b9ca-5254008de1cb-1-1 Received: from [216.34.181.88] ([216.34.181.88:58963] helo=lists.sourceforge.net) by smtp17.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 72/A3-21774-327E85A5; Fri, 12 Jan 2018 11:49:39 -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 1ea2Vx-0003NC-OX; Fri, 12 Jan 2018 16:49:09 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.193] 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 1ea2Vv-0003Mm-Qz for openvpn-devel@lists.sourceforge.net; Fri, 12 Jan 2018 16:49:07 +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=/UuiWymnK94NVA17SHmDKU7ybhZLULt96mVlC37p8Yw=; b=cUv1GtgSvnmUfketcJw0X3x39H CEIeMfoFz5+rXrcGnYbeQqa+wk+vuX5m63lIBbsa87ga+KE/apbVMNPk8lxk3DPyn/yswRMFXgqhC tc6z974pra5EToA5Z1mOz9drkuTpFMhfoFb/kx2LwWJ+R+8b+zHEkAVPgXp/HTXOuv6o=; 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=/UuiWymnK94NVA17SHmDKU7ybhZLULt96mVlC37p8Yw=; b=M4lQvugsocYteJLnlz6xc8BQiy zBWSeeTe7t+aBLMUVCnpD6ARz9yp1HCCUYFYelgzxdcb7WJlyUWgNscor8oSkJFhWl2A2ucTXSfqe HtQcEyVk6n6DwqlDnzVw/C2XZUiBwor5H9b+ZZskWZhSCx7Thk32ErGCIfSNWE/gJMks=; Received: from mail-wm0-f67.google.com ([74.125.82.67]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.89) id 1ea2Vu-0000vQ-53 for openvpn-devel@lists.sourceforge.net; Fri, 12 Jan 2018 16:49:07 +0000 Received: by mail-wm0-f67.google.com with SMTP id i11so13011224wmf.4 for ; Fri, 12 Jan 2018 08:49:06 -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 :in-reply-to:references; bh=/UuiWymnK94NVA17SHmDKU7ybhZLULt96mVlC37p8Yw=; b=MhJK+rcRJzDpbsjh1B2pOGpuMVaHtP49KF9svKAmdmSNXblBKoBWRQ67+iq15RoVFN smg6e3in2UnJikZCam9/rSwvHML6EK45JBu/Cap4ppHc3irhuw962weMTZnqhjPOJ2Ao MKOfRUNcLUsNgZxOhTdfhkFyxrZ1mLv3DVO3gBnHmhEHtpi3Ory98Csc7slf9EHqD5/E 4tuVNJLv4B8CXK7mgwes0CI4p/4rNlXNWl28GEUKRKUM9siTSa3ilHEh4LZHFZKeMrEB 9R+Du9NuoENxBIOq0AkPMArSeSBZAiEFSsWOR2rnHQWG9dd9DZFrmc5cMplmOFPSegLX O0PA== 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:in-reply-to:references; bh=/UuiWymnK94NVA17SHmDKU7ybhZLULt96mVlC37p8Yw=; b=In0TIuwJAmCt1YGkWTgwRQDj/aAKFh/HtgXAemzB5C8iKs/gu4LPGDJxaVoAXhrRA7 o9WvAxx8sMclcCZQ6UGrBtFtB9xmGnAz3jJrkYExT1VfU49rVM2t91i5Vs0lK4A5swAN C3ywDeGvr+dj470v5RgtiuMf6h1UcARrEka80R02uwDA7VWY6iQy4NENd0jcpo9CRii2 mX7btjuzSOu3ecRO0PD6EYVHpb5DSiweV8hVFfaNm1FuxzAUXmwmsh+sW2Io30oZsUnk LWOpksyJzdsmBGrEjEOmaAQL4HKqbnTLnvyC7jnd1jgMb6OEy9X3xNvxjZIBNwYFfAKb tDEQ== X-Gm-Message-State: AKwxytcHWn0pxvagxjymUvaFi2kZLHKCu9HGGKuJ30HfwOVNXEVuZ/IN JLckrXDRDEu4PiKzdFxqawj9GFl1 X-Google-Smtp-Source: ACJfBouqcyfl+hJz9axU+5xNCQf+4RtcvE5BdDuOuyEKHTe43V6PhTRc92Z7jVsQucqqIuRDERrWmw== X-Received: by 10.28.14.133 with SMTP id 127mr4179188wmo.152.1515775739935; Fri, 12 Jan 2018 08:48:59 -0800 (PST) Received: from edt-thinkpad.eho.intranet ([2a01:cb1c:53c:ce00:144a:841b:886c:3c9c]) by smtp.gmail.com with ESMTPSA id u5sm1606821wmf.47.2018.01.12.08.48.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 08:48:59 -0800 (PST) From: Emmanuel Deloget To: openvpn-devel@lists.sourceforge.net Date: Fri, 12 Jan 2018 17:48:26 +0100 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: 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 [74.125.82.67 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: 1ea2Vu-0000vQ-53 Subject: [Openvpn-devel] [PATCH 3/3] OpenSSL: remove EVP_PKEY_id() 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 The function is no longer used so we don't need to keep it in the OpenSSL 1.1 compatibility layer. Signed-off-by: Emmanuel Deloget Acked-by: Steffan Karger diff --git a/configure.ac b/configure.ac index b4fd1b3f..716b45dc 100644 --- a/configure.ac +++ b/configure.ac @@ -925,7 +925,6 @@ if test "${with_crypto_library}" = "openssl"; then X509_STORE_get0_objects \ X509_OBJECT_free \ X509_OBJECT_get_type \ - EVP_PKEY_id \ EVP_PKEY_get0_RSA \ EVP_PKEY_get0_DSA \ EVP_PKEY_get0_EC_KEY \ diff --git a/src/openvpn/openssl_compat.h b/src/openvpn/openssl_compat.h index 8b29cdaf..2c4a08c1 100644 --- a/src/openvpn/openssl_compat.h +++ b/src/openvpn/openssl_compat.h @@ -258,20 +258,6 @@ EVP_PKEY_get0_EC_KEY(EVP_PKEY *pkey) } #endif -#if !defined(HAVE_EVP_PKEY_ID) -/** - * Get the PKEY type - * - * @param pkey Public key object - * @return The key type - */ -static inline int -EVP_PKEY_id(const EVP_PKEY *pkey) -{ - return pkey ? pkey->type : EVP_PKEY_NONE; -} -#endif - #if !defined(HAVE_EVP_PKEY_GET0_DSA) /** * Get the DSA object of a public key