From patchwork Fri May 19 14:23:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Balakrishna Garapati X-Patchwork-Id: 100197 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp340480qge; Fri, 19 May 2017 07:23:44 -0700 (PDT) X-Received: by 10.200.37.56 with SMTP id 53mr9115164qtm.216.1495203824751; Fri, 19 May 2017 07:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495203824; cv=none; d=google.com; s=arc-20160816; b=r40U0pcLixKRJ1NlQp+L2z3abi/3jVA95uWfHmt4a62gug8EeK3HtMf+AoqhX33Uar e9wIHvspapCF9CbXcesh05jsuk+THmSKjq1JhrN0xebVaqO5cpUT3s/fip8R1A8PhHDn BMRY+wwzK5j941zHPAcmCFkirvYch9aIXh0HcIYSwfnRTUQe/OrP0IKwJspRGPqYXuCJ z9jwKDMxLoPbXPDi0JB8aIohpS4GgdDrU3bJ5eYgYiVmkwHBTVxtXLn+8f1R/ULddwJF yfbPQDx+JgQrfkYw9QoowS8JPctNyEIT2NCmSF5K0HPx0ijPmh2tmi22jiGSa/sR+y4J EA7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:message-id:date:to:from :delivered-to:arc-authentication-results; bh=+LNDw+KYNvkXep7BKBtvWQikCZq8eayVwp/wCE4rx10=; b=Y3IaGwpPP1j3Gkr+oSQRChJQV9cc1dKDY9PTMIPvMWERO9BTRac7z1cEOgGZzbtnZ2 89RI9VUBrFy2olgP9fWEbm7wpMn14Ue8vrXOyWdq0AQogPHz4OtVQD9J/Zq3VK69LPSq MBvR3W8df4p2Lvq2eBfKKQSMzOx3z0nas9gUw8uIrkFt4BZJO4nT8DxLWT97km59pF/H DmSN3jLxHhCmiMxSdo7NYBAaKMHceYWTfyopgktbleSmqqSXvQL0yLqSFLVyBQLPsIym 1cpRCrGjGjXrxk/wcbdbZpDftLEnMsS7oTB+wupZdOs+OTTbIoJEuM8lh93ezT0qXSYB y9NA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id e40si8864880qtf.199.2017.05.19.07.23.44; Fri, 19 May 2017 07:23:44 -0700 (PDT) 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 283C860E68; Fri, 19 May 2017 14:23:44 +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.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 80E4C609BA; Fri, 19 May 2017 14:23:38 +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 0ECA660E20; Fri, 19 May 2017 14:23:36 +0000 (UTC) Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by lists.linaro.org (Postfix) with ESMTPS id E4714609B0 for ; Fri, 19 May 2017 14:23:34 +0000 (UTC) Received: by mail-lf0-f52.google.com with SMTP id h4so1931036lfj.3 for ; Fri, 19 May 2017 07:23:34 -0700 (PDT) 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; bh=+LNDw+KYNvkXep7BKBtvWQikCZq8eayVwp/wCE4rx10=; b=oKK86tczKeWitdZBJD9pWdM2Mf06lTAmBVnBezl+uVM/QqnfhvxqJNIBI6WtL9WMRm 4iWGr5g6hiYgmanGkkgt9pJud6gn/IhzuM9NvP8CNKnz9l8nzMrub9kTvGkuVTnumZrO Jt5V8e5bscr7Lz5b5KpMH72rrBG5rUTijkWelabpCeNJqbpiOOcunx+ySWclZ62F3/GV paeDzyhkVq1Kq7/KgaSm15JgemwNatxjUxcv3/WHsydxjBuuinKcrIzS5DZC8sJg4G5q Kb0FcSaEpKBHnxXKEXNAstbWlr9+e+10g3dk+guTwjvjhmpRnudsl2EcXxEX1zXGJJGy G7Vg== X-Gm-Message-State: AODbwcDI1UT9CvLRPGbyUr9iy0Ug6F2VsG86MV7H0JAiCMN4+1xCJu+L EtGqzfmbISREpCLkrVgRW+8a X-Received: by 10.25.192.3 with SMTP id q3mr2206216lff.4.1495203813383; Fri, 19 May 2017 07:23:33 -0700 (PDT) Received: from elxahtkds32.localdomain (host-95-192-142-105.mobileonline.telia.com. [95.192.142.105]) by smtp.gmail.com with ESMTPSA id 19sm1532790ljf.32.2017.05.19.07.23.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 May 2017 07:23:32 -0700 (PDT) From: Balakrishna Garapati To: lng-odp@lists.linaro.org Date: Fri, 19 May 2017 16:23:30 +0200 Message-Id: <1495203810-9148-1-git-send-email-balakrishna.garapati@linaro.org> X-Mailer: git-send-email 1.9.1 Subject: [lng-odp] [API-NEXT PATCHv4] api: crypto: change iv_len field to feature min-max len 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" dpdk pmd's require to minatain min, max, inc fields for all crypto capabilitites. By making iv_len to feature like dpdk pmd's it is easier to create cipher entires in odp based on key_len. Signed-off-by: Balakrishna Garapati --- since v1: fixed comments from v1, - updated the description about the patch - Fixed the bug in crypto validation since v2: if statement correction in validation "check_cipher_options" since v3: updated doing key_len check prior to iv_len and corrected iv_len data type in validation "check_cipher_options" include/odp/api/spec/crypto.h | 12 +++- platform/linux-generic/odp_crypto.c | 8 +-- .../validation/api/crypto/odp_crypto_test_inp.c | 81 ++++++---------------- 3 files changed, 37 insertions(+), 64 deletions(-) -- 1.9.1 diff --git a/include/odp/api/spec/crypto.h b/include/odp/api/spec/crypto.h index c47d314..a1b540a 100644 --- a/include/odp/api/spec/crypto.h +++ b/include/odp/api/spec/crypto.h @@ -497,7 +497,17 @@ typedef struct odp_crypto_cipher_capability_t { uint32_t key_len; /** IV length in bytes */ - uint32_t iv_len; + struct { + /** Minimum iv length in bytes */ + uint32_t min; + + /** Maximum iv length in bytes */ + uint32_t max; + + /** Increment of supported lengths between min and max + * (in bytes) */ + uint32_t inc; + } iv_len; } odp_crypto_cipher_capability_t; diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index a0f3f7e..3e9b607 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -35,16 +35,16 @@ * Keep sorted: first by key length, then by IV length */ static const odp_crypto_cipher_capability_t cipher_capa_des[] = { -{.key_len = 24, .iv_len = 8} }; +{.key_len = 24, .iv_len = {.min = 8, .max = 8, .inc = 0} } }; static const odp_crypto_cipher_capability_t cipher_capa_trides_cbc[] = { -{.key_len = 24, .iv_len = 8} }; +{.key_len = 24, .iv_len = {.min = 8, .max = 8, .inc = 0} } }; static const odp_crypto_cipher_capability_t cipher_capa_aes_cbc[] = { -{.key_len = 16, .iv_len = 16} }; +{.key_len = 16, .iv_len = {.min = 16, .max = 16, .inc = 0} } }; static const odp_crypto_cipher_capability_t cipher_capa_aes_gcm[] = { -{.key_len = 16, .iv_len = 12} }; +{.key_len = 16, .iv_len = {.min = 12, .max = 12, .inc = 0} } }; /* * Authentication algorithm capabilities 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 24ea493..0545384 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 @@ -93,10 +93,6 @@ static void alg_test(odp_crypto_op_t op, odp_crypto_op_param_t op_params; uint8_t *data_addr; int data_off; - odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; - odp_crypto_auth_capability_t auth_capa[MAX_ALG_CAPA]; - int num, i; - int found; rc = odp_crypto_capability(&capa); CU_ASSERT(!rc); @@ -136,59 +132,6 @@ static void alg_test(odp_crypto_op_t op, CU_ASSERT(!rc); CU_ASSERT((~capa.auths.all_bits & capa.hw_auths.all_bits) == 0); - num = odp_crypto_cipher_capability(cipher_alg, cipher_capa, - MAX_ALG_CAPA); - - if (cipher_alg != ODP_CIPHER_ALG_NULL) { - CU_ASSERT(num > 0); - found = 0; - } else { - CU_ASSERT(num == 0); - found = 1; - } - - CU_ASSERT(num <= MAX_ALG_CAPA); - - if (num > MAX_ALG_CAPA) - num = MAX_ALG_CAPA; - - /* Search for the test case */ - for (i = 0; i < num; i++) { - if (cipher_capa[i].key_len == cipher_key.length && - cipher_capa[i].iv_len == ses_iv.length) { - found = 1; - break; - } - } - - CU_ASSERT(found); - - num = odp_crypto_auth_capability(auth_alg, auth_capa, MAX_ALG_CAPA); - - if (auth_alg != ODP_AUTH_ALG_NULL) { - CU_ASSERT(num > 0); - found = 0; - } else { - CU_ASSERT(num == 0); - found = 1; - } - - CU_ASSERT(num <= MAX_ALG_CAPA); - - if (num > MAX_ALG_CAPA) - num = MAX_ALG_CAPA; - - /* Search for the test case */ - for (i = 0; i < num; i++) { - if (auth_capa[i].digest_len == digest_len && - auth_capa[i].key_len == auth_key.length) { - found = 1; - break; - } - } - - CU_ASSERT(found); - /* Create a crypto session */ odp_crypto_session_param_init(&ses_params); ses_params.op = op; @@ -379,14 +322,34 @@ static int check_cipher_options(odp_cipher_alg_t cipher, uint32_t key_len, { int i; int num; + int found = 0; + odp_crypto_cipher_capability_t cipher_capa[MAX_ALG_CAPA]; num = odp_crypto_cipher_capability(cipher, cipher_capa, MAX_ALG_CAPA); CU_ASSERT_FATAL(num >= 1); for (i = 0; i < num; i++) { - if (key_len == cipher_capa[i].key_len && - iv_len == cipher_capa[i].iv_len) + if (key_len != cipher_capa[i].key_len) + continue; + + uint32_t inc = cipher_capa[i].iv_len.inc; + uint32_t iv_min = cipher_capa[i].iv_len.min; + uint32_t iv_max = cipher_capa[i].iv_len.max; + + if (inc == 0 && iv_len == iv_min) { + found = 1; + } else { + for (uint32_t iv = iv_min; iv <= iv_max; + iv = iv + inc) { + if (iv_len == iv) { + found = 1; + break; + } + } + } + + if (found == 1) break; }