From patchwork Thu Feb 23 13:37:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 94377 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp215572qgi; Thu, 23 Feb 2017 05:38:09 -0800 (PST) X-Received: by 10.107.169.170 with SMTP id f42mr11123002ioj.223.1487857089706; Thu, 23 Feb 2017 05:38:09 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m194si4719195itb.75.2017.02.23.05.38.09; Thu, 23 Feb 2017 05:38:09 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 3378A60EA1; Thu, 23 Feb 2017 13:38:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3EB9E609A0; Thu, 23 Feb 2017 13:37:47 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E433D60EFA; Thu, 23 Feb 2017 13:37:42 +0000 (UTC) Received: from mail-lf0-f44.google.com (mail-lf0-f44.google.com [209.85.215.44]) by lists.linaro.org (Postfix) with ESMTPS id 2FF7060999 for ; Thu, 23 Feb 2017 13:37:40 +0000 (UTC) Received: by mail-lf0-f44.google.com with SMTP id g134so16349965lfe.1 for ; Thu, 23 Feb 2017 05:37:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=2yIOl+cx9mN4O4x0hHqxw4zglV4ZM8j7f7LvD/oOHz0=; b=D10V8FBwiKJj8yoVNI8Px/vp4IQsGwKbTAuvnuV47dClyaP1NfrntIf4W/FhHQ4G0n CXz2xNoVAzP4TOV/gCBeRkT0ZJkW0zX/rdplwqHw2+zg8cXpFtnwrOx4V/xIymmsldzb dz+ypFvW7BO9TdWxnWt4DctCCw2v+bWaBlkwyk4Bg9Ix5Lr61wkmsljHD9Jt7FmuuFbH NZajg11ryXW4RcQNobo1jN9Jm5KSVMzKfGeFw8V6U9jo3wugEmVfk0cWozOuqhRMzYaa tVigchLOPtmQGhO3gObOEqaDuuoufUSguRXOoskq99UZYd1XvctlAxF54zFdTWACWn+S 6s6A== X-Gm-Message-State: AMke39lzW6fgufe1bhDu7IqfheybgshpUNwxzMI/3Un/e2DGcrtae2eERl3KukLTx+2Z2Sx7Oy0= X-Received: by 10.46.69.139 with SMTP id s133mr10601084lja.56.1487857058843; Thu, 23 Feb 2017 05:37:38 -0800 (PST) Received: from forlindon.lumag.auriga.ru ([89.223.65.198]) by smtp.gmail.com with ESMTPSA id e86sm8062893lji.32.2017.02.23.05.37.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Feb 2017 05:37:38 -0800 (PST) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Thu, 23 Feb 2017 16:37:34 +0300 Message-Id: <20170223133734.19436-3-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170223133734.19436-1-dmitry.ereminsolenikov@linaro.org> References: <20170223133734.19436-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH v3 3/3] linux-generic: crypto: support OpenSSL 1.1.0 X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" OpenSSL 1.1.0 uses new threading API. It is no longer necessary to set locking callbacks to use OpenSSL in a multi-threaded environment. OpenSSL provides compatibility callbacks, but ODP compilation still fails with unused function/argument errors. So, to support compiling ODP with OpenSSL 1.1.x, add ODP_UNUSED annotiations to lock/thread_id callbacks. Signed-off-by: Dmitry Eremin-Solenikov --- platform/linux-generic/odp_crypto.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index adadbf97..54b222fd 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -949,14 +949,14 @@ odp_crypto_operation(odp_crypto_op_param_t *param, return 0; } -static void openssl_thread_id(CRYPTO_THREADID *id) +static void ODP_UNUSED openssl_thread_id(CRYPTO_THREADID ODP_UNUSED *id) { CRYPTO_THREADID_set_numeric(id, odp_thread_id()); } -static void openssl_lock(int mode, int n, - const char *file ODP_UNUSED, - int line ODP_UNUSED) +static void ODP_UNUSED openssl_lock(int mode, int n, + const char *file ODP_UNUSED, + int line ODP_UNUSED) { if (mode & CRYPTO_LOCK) odp_ticketlock_lock((odp_ticketlock_t *)