From patchwork Tue Mar 7 11:52:24 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: 94982 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp1849672qgd; Tue, 7 Mar 2017 03:54:28 -0800 (PST) X-Received: by 10.200.34.37 with SMTP id o34mr20440111qto.213.1488887668122; Tue, 07 Mar 2017 03:54:28 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w6si9056891qtd.210.2017.03.07.03.54.27; Tue, 07 Mar 2017 03:54:28 -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 B163262D2D; Tue, 7 Mar 2017 11:54:27 +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 7F91862D4D; Tue, 7 Mar 2017 11:52:53 +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 D93C060F3B; Tue, 7 Mar 2017 11:52:44 +0000 (UTC) Received: from mail-wm0-f43.google.com (mail-wm0-f43.google.com [74.125.82.43]) by lists.linaro.org (Postfix) with ESMTPS id 7EAA362CC1 for ; Tue, 7 Mar 2017 11:52:29 +0000 (UTC) Received: by mail-wm0-f43.google.com with SMTP id t189so2552065wmt.1 for ; Tue, 07 Mar 2017 03:52:29 -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=9xptw5fEdhnChjozADqAtDW7y4yaXWwZ1kwBjJSqzxw=; b=D/kGy6QetdQWOMRbxMOIPxwj7nkNIfEXpRTki/ZO5EuNMZgKapUQhr8n8Nt3M5Q09f 7Oq1+iFftuNSkg5nuUE8MT6hfWKXcRRLPNE9qNaUwYiLtybLinoTCyALY9mQqDCVwTnZ 2/gkbOS/SXeoLNs2NGBxzm++SSM7nD6qirJOiLDdG3zvRAUEje6Q9RzTQBjZflYeJTf5 BV2K1be+P/WAW1kaKlLqvhpMqZngq8U2EHYwt9hieX9e3CbgaNX4Ph6PwAUs3zkh8LPn n5i1naq8PifkZb3J3IdkSd6qqwun+y6y+z0d6n6AbHwmtvRVShDzXYlbgMRxdvmAUO74 Oycg== X-Gm-Message-State: AMke39n9iqrTL+S9FqVRTM7Tn3W+lb1psZ6sroezr4ZSRaQ7r3IWpKor5KUjWYxHkq9sjyvH93k8Dw== X-Received: by 10.28.44.66 with SMTP id s63mr418603wms.77.1488887548421; Tue, 07 Mar 2017 03:52:28 -0800 (PST) Received: from forlindon.c.hoisthospitality.com ([109.74.56.122]) by smtp.gmail.com with ESMTPSA id y145sm18652299wmc.17.2017.03.07.03.52.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 03:52:27 -0800 (PST) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Tue, 7 Mar 2017 14:52:24 +0300 Message-Id: <20170307115225.29225-3-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170307115225.29225-1-dmitry.ereminsolenikov@linaro.org> References: <20170307115225.29225-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [API-NEXT 2/3] api: crypto: use ODP_DEPRECATED{, _FIELD} declarations 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" Add ODP_DEPRECATED and ODP_DEPRECATED_FIELD declarations to crypto API header, actually urging applications to switch to newer API. Signed-off-by: Dmitry Eremin-Solenikov --- include/odp/api/spec/crypto.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) -- 2.11.0 diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index d30f050f..177f8444 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -19,6 +19,8 @@ extern "C" { #endif +#include + /** @defgroup odp_crypto ODP CRYPTO * Macros, enums, types and operations to utilise crypto. * @{ @@ -82,10 +84,10 @@ typedef enum { ODP_CIPHER_ALG_AES_GCM, /** @deprecated Use ODP_CIPHER_ALG_AES_CBC instead */ - ODP_CIPHER_ALG_AES128_CBC, + ODP_DEPRECATED_FIELD(ODP_CIPHER_ALG_AES128_CBC), /** @deprecated Use ODP_CIPHER_ALG_AES_GCM instead */ - ODP_CIPHER_ALG_AES128_GCM + ODP_DEPRECATED_FIELD(ODP_CIPHER_ALG_AES128_GCM) } odp_cipher_alg_t; @@ -127,13 +129,13 @@ typedef enum { ODP_AUTH_ALG_AES_GCM, /** @deprecated Use ODP_AUTH_ALG_MD5_HMAC instead */ - ODP_AUTH_ALG_MD5_96, + ODP_DEPRECATED_FIELD(ODP_AUTH_ALG_MD5_96), /** @deprecated Use ODP_AUTH_ALG_SHA256_HMAC instead */ - ODP_AUTH_ALG_SHA256_128, + ODP_DEPRECATED_FIELD(ODP_AUTH_ALG_SHA256_128), /** @deprecated Use ODP_AUTH_ALG_AES_GCM instead */ - ODP_AUTH_ALG_AES128_GCM + ODP_DEPRECATED_FIELD(ODP_AUTH_ALG_AES128_GCM) } odp_auth_alg_t; /** @@ -158,10 +160,10 @@ typedef union odp_crypto_cipher_algos_t { uint32_t aes_gcm : 1; /** @deprecated Use aes_cbc instead */ - uint32_t aes128_cbc : 1; + uint32_t ODP_DEPRECATED_FIELD(aes128_cbc) : 1; /** @deprecated Use aes_gcm instead */ - uint32_t aes128_gcm : 1; + uint32_t ODP_DEPRECATED_FIELD(aes128_gcm) : 1; } bit; /** All bits of the bit field structure @@ -196,13 +198,13 @@ typedef union odp_crypto_auth_algos_t { uint32_t aes_gcm : 1; /** @deprecated Use md5_hmac instead */ - uint32_t md5_96 : 1; + uint32_t ODP_DEPRECATED_FIELD(md5_96) : 1; /** @deprecated Use sha256_hmac instead */ - uint32_t sha256_128 : 1; + uint32_t ODP_DEPRECATED_FIELD(sha256_128) : 1; /** @deprecated Use aes_gcm instead */ - uint32_t aes128_gcm : 1; + uint32_t ODP_DEPRECATED_FIELD(aes128_gcm) : 1; } bit; /** All bits of the bit field structure @@ -317,7 +319,7 @@ typedef struct odp_crypto_session_param_t { } odp_crypto_session_param_t; /** @deprecated Use odp_crypto_session_param_t instead */ -typedef odp_crypto_session_param_t odp_crypto_session_params_t; +typedef odp_crypto_session_param_t odp_crypto_session_params_t ODP_DEPRECATED; /** * Crypto API per packet operation parameters @@ -373,7 +375,7 @@ typedef struct odp_crypto_op_param_t { } odp_crypto_op_param_t; /** @deprecated Use odp_crypto_op_param_t instead */ -typedef odp_crypto_op_param_t odp_crypto_op_params_t; +typedef odp_crypto_op_param_t odp_crypto_op_params_t ODP_DEPRECATED; /** * Crypto API session creation return code