From patchwork Tue Apr 4 21:59:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle van der Waa X-Patchwork-Id: 746975 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3vyNDw1Z02z9s80 for ; Wed, 5 Apr 2017 08:00:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=vdwaa-nl.20150623.gappssmtp.com header.i=@vdwaa-nl.20150623.gappssmtp.com header.b="WZKRU3Ii"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id EC05EC21CCA; Tue, 4 Apr 2017 21:59:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 186BFC21C68; Tue, 4 Apr 2017 21:59:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4060BC21C2E; Tue, 4 Apr 2017 21:59:36 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id C0ADDC21C2B for ; Tue, 4 Apr 2017 21:59:35 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id x75so8042353wma.1 for ; Tue, 04 Apr 2017 14:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vdwaa-nl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fwAzwnzvQMfZ11+eSPvKC9Epgs5WSLQTKAadaxUea9k=; b=WZKRU3Iivy/uiiid8FicwIn5OOMmWNscfAr1tVL96sEAaJZDQ1YG7UQNdbqtNxxpz7 MOLLadlpcop34y6OpeSTTCy5OVwMX5H/5kLPeKmeneEnzbtdqZFPtkajMvZUqV+Wu6UL YXZFaIhcQ81fkmuPxIYvFH+fHlOmh+pHBiMvViLHWDvFQuRKCR+SY4oTPy05gzCGH39S z46xA9lT4UEtCUj99hPJ+cqrzvnvbwvggSfusvNnw09Q7+Mlia5TeF87QCiztim/Koad Bv5k1hxDXq+zcg/WdYnVvvQ+t8VVUKZ26NWEbHeK+lIA4GfU06ijzHn/FkkBMNChtXOe 8SAg== 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=fwAzwnzvQMfZ11+eSPvKC9Epgs5WSLQTKAadaxUea9k=; b=ZnNFa82lUmD7yprHqRjfnkekzApBjzbMhc+LUf+krpnYpA5bOwCLmGjkUA/qL9UsDl DPrABNEpdvAZJpaIzVslMFzRk1F1beBUu0RE7QWm+tAtz/Slq2vbtf/MYf5U436F5K38 JBWu11lHL/z2cfjDbuBxDpAIFBfIx36gOSYYtgewAA2uOoeEhk75qQReldW21/MVEDYW BE+GxT2RajDmwuzgRbLL+jVCaPvr9kHrAxq/1lUXQyz/fzQFYwO35KQhVWeeAV/m0zcf j9kqBonJN0SU3JzJE46UZKysEtxNaPylmjp0tIXCjoAwusp2n6zWlmkel3lWYBuA4aRA /q7w== X-Gm-Message-State: AFeK/H2tlO7YJuRcN2s0xE8WklhsFj+1qBn/PVLRRxipnXDRdsC3E8wTxRcp3ut/6ZHusw== X-Received: by 10.28.139.195 with SMTP id n186mr17243169wmd.139.1491343175518; Tue, 04 Apr 2017 14:59:35 -0700 (PDT) Received: from lenovomate.space.revspace.nl ([2001:610:76a:0:d572:4823:b24e:8def]) by smtp.gmail.com with ESMTPSA id a10sm23873617wra.17.2017.04.04.14.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 14:59:34 -0700 (PDT) From: Jelle van der Waa To: Simon Glass , Andrew Duda , "mario . six @ gdsys . cc" , u-boot@lists.denx.de Date: Tue, 4 Apr 2017 23:59:49 +0200 Message-Id: <20170404215950.6588-2-jelle@vdwaa.nl> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170404215950.6588-1-jelle@vdwaa.nl> References: <20170404215950.6588-1-jelle@vdwaa.nl> Cc: Tom Rini Subject: [U-Boot] [PATCH v2 2/3] rsa: Fix deprecated warnings for OpenSSL 1.1.x X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" ERR_remove_thread_state is deprecated in OpenSSL 1.1.x and does not do anything anymore. Thread initialisation and deinitialisation is now handled by the OpenSSL library. Signed-off-by: Jelle van der Waa Reviewed-by: Simon Glass --- lib/rsa/rsa-sign.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index d4e216cc0e..8a73791fed 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -356,9 +356,9 @@ static void rsa_remove(void) { CRYPTO_cleanup_all_ex_data(); ERR_free_strings(); -#ifdef HAVE_ERR_REMOVE_THREAD_STATE +#if OPENSSL_VERSION_NUMBER >= 0x10000000L && OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) ERR_remove_thread_state(NULL); -#else +#elif OPENSSL_VERSION_NUMBER < 0x10000000L ERR_remove_state(0); #endif EVP_cleanup();