From patchwork Fri Jan 27 14:29:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 92663 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp232170obz; Fri, 27 Jan 2017 06:38:26 -0800 (PST) X-Received: by 10.233.223.129 with SMTP id t123mr8032639qkf.191.1485527906158; Fri, 27 Jan 2017 06:38:26 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i50si3660237qta.73.2017.01.27.06.38.25; Fri, 27 Jan 2017 06:38:26 -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 D11AC62DE5; Fri, 27 Jan 2017 14:38:25 +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 9AA3960DC9; Fri, 27 Jan 2017 14:31:44 +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 B511660DC9; Fri, 27 Jan 2017 14:31:35 +0000 (UTC) Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by lists.linaro.org (Postfix) with ESMTPS id 8248C60D73 for ; Fri, 27 Jan 2017 14:29:58 +0000 (UTC) Received: by mail-lf0-f53.google.com with SMTP id x1so76117962lff.0 for ; Fri, 27 Jan 2017 06:29:58 -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:cc:subject:date:message-id:in-reply-to :references; bh=fbxf+Uuar7aDyYLWfCLbuR1MVdzkoc/uj4zW3pZwblk=; b=U+VY6IYJmDWZGt9RfFcCxCuiTISlZS8dgRU99eo+3Xzas4sm+dgMzirGXI/TA/SGgb IG0r1q2Q39TO70kwmepKcV/3FY3G2u+AgzKcpj7h5n8ROOk5j4GJcAoNoMWZl0UudW8Z 04TGD5JiL2FDYl9W5F6HNo3Y8zzJaBFxV8p1Y073o7GsYOXMzE4nmirnLNaTi/D+pHrb FQ4y+7YfROqf7QkpD4CrvqB2EIJdt5eCoN6pDohcWStZzHxX9gDHi1jBPWwV0STFkAh3 WvbSiT7DckK/3yT9jRl5DA8v4lllJaLoEuXnY6mefA6IA905LtfXXhT3GzOt6iTFpVi5 ILnA== X-Gm-Message-State: AIkVDXLctlHTw1fE5DiRBzGUMfzlH+ixJBTOmG2k2ZFHKpBJCfZrC7APA0o3JfjcJzk+FF4buOc= X-Received: by 10.25.34.196 with SMTP id i187mr2902046lfi.176.1485527397294; Fri, 27 Jan 2017 06:29:57 -0800 (PST) Received: from localhost.localdomain (ppp109-252-7-40.pppoe.spdop.ru. [109.252.7.40]) by smtp.gmail.com with ESMTPSA id t9sm1325479lja.48.2017.01.27.06.29.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Jan 2017 06:29:56 -0800 (PST) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Fri, 27 Jan 2017 17:29:18 +0300 Message-Id: <20170127142921.29029-13-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.11.0.295.gd7dffce In-Reply-To: <20170127142921.29029-1-maxim.uvarov@linaro.org> References: <20170127142921.29029-1-maxim.uvarov@linaro.org> Subject: [lng-odp] [API-NEXT PATCH 12/15] merge fix: odp_crypto_test_inp.c 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" Signed-off-by: Maxim Uvarov --- .../validation/api/crypto/odp_crypto_test_inp.c | 43 ---------------------- 1 file changed, 43 deletions(-) -- 2.11.0.295.gd7dffce diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c index 66d61486..80689387 100644 --- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c +++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c @@ -96,7 +96,6 @@ static void alg_test(odp_crypto_op_t op, odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; int num, i; int found; -<<<<<<< HEAD rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); @@ -132,13 +131,10 @@ static void alg_test(odp_crypto_op_t op, if (auth_alg == ODP_AUTH_ALG_SHA256_HMAC && !(capa.auths.bit.sha256_hmac)) rc = -1; -======= ->>>>>>> v1.13.0.0 CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); -<<<<<<< HEAD num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, MAX_ALG_CAPA); @@ -148,28 +144,6 @@ static void alg_test(odp_crypto_op_t op, } else { CU_ASSERT(num == 0); found = 1; -======= - if (capability.hw_ciphers.all_bits) { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.hw_ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.hw_ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.hw_ciphers.bit.aes_gcm)) - rc = -1; - } else { - if (cipher_alg == ODP_CIPHER_ALG_3DES_CBC && - !(capability.ciphers.bit.trides_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_CBC && - !(capability.ciphers.bit.aes_cbc)) - rc = -1; - if (cipher_alg == ODP_CIPHER_ALG_AES_GCM && - !(capability.ciphers.bit.aes_gcm)) - rc = -1; ->>>>>>> v1.13.0.0 } CU_ASSERT(num <= MAX_ALG_CAPA); @@ -177,7 +151,6 @@ static void alg_test(odp_crypto_op_t op, if (num > MAX_ALG_CAPA) num = MAX_ALG_CAPA; -<<<<<<< HEAD /* Search for the test case */ for (i = 0; i < num; i++) { if (cipher_capa[i].key_len == cipher_key.length && @@ -197,22 +170,6 @@ static void alg_test(odp_crypto_op_t op, } else { CU_ASSERT(num == 0); found = 1; -======= - if (capability.hw_auths.all_bits) { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.hw_auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.hw_auths.bit.null)) - rc = -1; - } else { - if (auth_alg == ODP_AUTH_ALG_AES_GCM && - !(capability.auths.bit.aes_gcm)) - rc = -1; - if (auth_alg == ODP_AUTH_ALG_NULL && - !(capability.auths.bit.null)) - rc = -1; ->>>>>>> v1.13.0.0 } CU_ASSERT(num <= MAX_ALG_CAPA);