From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id B212258C5 for ; Fri, 26 Aug 2016 05:08:24 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP; 25 Aug 2016 20:08:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,579,1464678000"; d="scan'208";a="753650991" Received: from sie-lab-214-036.ir.intel.com (HELO silpixa00394365.ir.intel.com) ([10.237.214.36]) by FMSMGA003.fm.intel.com with ESMTP; 25 Aug 2016 20:08:23 -0700 From: Pablo de Lara To: dev@dpdk.org Cc: Pablo de Lara Date: Fri, 26 Aug 2016 04:09:14 +0100 Message-Id: <1472180955-42960-3-git-send-email-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472180955-42960-1-git-send-email-pablo.de.lara.guarch@intel.com> References: <1472180955-42960-1-git-send-email-pablo.de.lara.guarch@intel.com> Subject: [dpdk-dev] [PATCH 2/3] app/test: rename some functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Aug 2016 03:08:25 -0000 Before adding the new ZUC tests, since they will use the existing common functions for SNOW3G and KASUMI, these functions are renamed to *_wireless_algo_*, instead of *_snow3g_kasumi_*, as they are common functions for all the three wireless algorithms. Signed-off-by: Pablo de Lara --- app/test/test_cryptodev.c | 78 +++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index d7dec2b..703df91 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -1095,7 +1095,7 @@ test_AES_qat_all(void) /* ***** Snow3G Tests ***** */ static int -create_snow3g_kasumi_hash_session(uint8_t dev_id, +create_wireless_algo_hash_session(uint8_t dev_id, const uint8_t *key, const uint8_t key_len, const uint8_t aad_len, const uint8_t auth_len, enum rte_crypto_auth_operation op, @@ -1126,7 +1126,7 @@ create_snow3g_kasumi_hash_session(uint8_t dev_id, } static int -create_snow3g_kasumi_cipher_session(uint8_t dev_id, +create_wireless_algo_cipher_session(uint8_t dev_id, enum rte_crypto_cipher_operation op, enum rte_crypto_cipher_algorithm algo, const uint8_t *key, const uint8_t key_len) @@ -1157,7 +1157,7 @@ create_snow3g_kasumi_cipher_session(uint8_t dev_id, } static int -create_snow3g_kasumi_cipher_operation(const uint8_t *iv, const unsigned iv_len, +create_wireless_algo_cipher_operation(const uint8_t *iv, const unsigned iv_len, const unsigned cipher_len, const unsigned cipher_offset, enum rte_crypto_cipher_algorithm algo) @@ -1202,7 +1202,7 @@ create_snow3g_kasumi_cipher_operation(const uint8_t *iv, const unsigned iv_len, } static int -create_snow3g_kasumi_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_len, +create_wireless_algo_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_len, const unsigned cipher_len, const unsigned cipher_offset, enum rte_crypto_cipher_algorithm algo) @@ -1247,7 +1247,7 @@ create_snow3g_kasumi_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_le } static int -create_snow3g_kasumi_cipher_auth_session(uint8_t dev_id, +create_wireless_algo_cipher_auth_session(uint8_t dev_id, enum rte_crypto_cipher_operation cipher_op, enum rte_crypto_auth_operation auth_op, enum rte_crypto_auth_algorithm auth_algo, @@ -1294,7 +1294,7 @@ create_snow3g_kasumi_cipher_auth_session(uint8_t dev_id, } static int -create_snow3g_kasumi_auth_cipher_session(uint8_t dev_id, +create_wireless_algo_auth_cipher_session(uint8_t dev_id, enum rte_crypto_cipher_operation cipher_op, enum rte_crypto_auth_operation auth_op, enum rte_crypto_auth_algorithm auth_algo, @@ -1338,7 +1338,7 @@ create_snow3g_kasumi_auth_cipher_session(uint8_t dev_id, } static int -create_snow3g_kasumi_hash_operation(const uint8_t *auth_tag, +create_wireless_algo_hash_operation(const uint8_t *auth_tag, const unsigned auth_tag_len, const uint8_t *aad, const unsigned aad_len, unsigned data_pad_len, @@ -1418,7 +1418,7 @@ create_snow3g_kasumi_hash_operation(const uint8_t *auth_tag, } static int -create_snow3g_kasumi_cipher_hash_operation(const uint8_t *auth_tag, +create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag, const unsigned auth_tag_len, const uint8_t *aad, const uint8_t aad_len, unsigned data_pad_len, @@ -1521,7 +1521,7 @@ create_snow3g_kasumi_cipher_hash_operation(const uint8_t *auth_tag, } static int -create_snow3g_kasumi_auth_cipher_operation(const unsigned auth_tag_len, +create_wireless_algo_auth_cipher_operation(const unsigned auth_tag_len, const uint8_t *iv, const uint8_t iv_len, const uint8_t *aad, const uint8_t aad_len, unsigned data_pad_len, @@ -1631,7 +1631,7 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata) uint8_t *plaintext; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0], + retval = create_wireless_algo_hash_session(ts_params->valid_devs[0], tdata->key.data, tdata->key.len, tdata->aad.len, tdata->digest.len, RTE_CRYPTO_AUTH_OP_GENERATE, @@ -1654,7 +1654,7 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata) memcpy(plaintext, tdata->plaintext.data, plaintext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_hash_operation(NULL, tdata->digest.len, + retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len, tdata->aad.data, tdata->aad.len, plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_SNOW3G_UIA2, @@ -1692,7 +1692,7 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata) uint8_t *plaintext; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0], + retval = create_wireless_algo_hash_session(ts_params->valid_devs[0], tdata->key.data, tdata->key.len, tdata->aad.len, tdata->digest.len, RTE_CRYPTO_AUTH_OP_VERIFY, @@ -1714,7 +1714,7 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata) memcpy(plaintext, tdata->plaintext.data, plaintext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_hash_operation(tdata->digest.data, + retval = create_wireless_algo_hash_operation(tdata->digest.data, tdata->digest.len, tdata->aad.data, tdata->aad.len, plaintext_pad_len, @@ -1753,7 +1753,7 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata) uint8_t *plaintext; /* Create KASUMI session */ - retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0], + retval = create_wireless_algo_hash_session(ts_params->valid_devs[0], tdata->key.data, tdata->key.len, tdata->aad.len, tdata->digest.len, RTE_CRYPTO_AUTH_OP_GENERATE, @@ -1776,7 +1776,7 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata) memcpy(plaintext, tdata->plaintext.data, plaintext_len); /* Create KASUMI operation */ - retval = create_snow3g_kasumi_hash_operation(NULL, tdata->digest.len, + retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len, tdata->aad.data, tdata->aad.len, plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_KASUMI_F9, @@ -1814,7 +1814,7 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata) uint8_t *plaintext; /* Create KASUMI session */ - retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0], + retval = create_wireless_algo_hash_session(ts_params->valid_devs[0], tdata->key.data, tdata->key.len, tdata->aad.len, tdata->digest.len, RTE_CRYPTO_AUTH_OP_VERIFY, @@ -1836,7 +1836,7 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata) memcpy(plaintext, tdata->plaintext.data, plaintext_len); /* Create KASUMI operation */ - retval = create_snow3g_kasumi_hash_operation(tdata->digest.data, + retval = create_wireless_algo_hash_operation(tdata->digest.data, tdata->digest.len, tdata->aad.data, tdata->aad.len, plaintext_pad_len, @@ -2014,7 +2014,7 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata) unsigned plaintext_len; /* Create KASUMI session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_KASUMI_F8, tdata->key.data, tdata->key.len); @@ -2038,7 +2038,7 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata) TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len); /* Create KASUMI operation */ - retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, tdata->iv.len, + retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, tdata->validCipherOffsetLenInBits.len, RTE_CRYPTO_CIPHER_KASUMI_F8); @@ -2079,7 +2079,7 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata) unsigned plaintext_len; /* Create KASUMI session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_KASUMI_F8, tdata->key.data, tdata->key.len); @@ -2105,7 +2105,7 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata) TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len); /* Create KASUMI operation */ - retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data, + retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, tdata->validCipherOffsetLenInBits.len, @@ -2147,7 +2147,7 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata) unsigned ciphertext_len; /* Create KASUMI session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_CIPHER_KASUMI_F8, tdata->key.data, tdata->key.len); @@ -2173,7 +2173,7 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata) TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len); /* Create KASUMI operation */ - retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data, + retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->ciphertext.len, tdata->validCipherOffsetLenInBits.len, @@ -2215,7 +2215,7 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata) unsigned ciphertext_len; /* Create KASUMI session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_CIPHER_KASUMI_F8, tdata->key.data, tdata->key.len); @@ -2239,7 +2239,7 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata) TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len); /* Create KASUMI operation */ - retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, + retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->ciphertext.len, tdata->validCipherOffsetLenInBits.len, @@ -2281,7 +2281,7 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata) unsigned plaintext_len; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_SNOW3G_UEA2, tdata->key.data, tdata->key.len); @@ -2305,7 +2305,7 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata) TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, tdata->iv.len, + retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, tdata->validCipherOffsetLenInBits.len, RTE_CRYPTO_CIPHER_SNOW3G_UEA2); @@ -2347,7 +2347,7 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata) unsigned plaintext_len; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_SNOW3G_UEA2, tdata->key.data, tdata->key.len); @@ -2378,7 +2378,7 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata) TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data, + retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, tdata->validCipherOffsetLenInBits.len, @@ -2441,7 +2441,7 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata) uint8_t *expected_ciphertext_shifted; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_CIPHER_SNOW3G_UEA2, tdata->key.data, tdata->key.len); @@ -2479,7 +2479,7 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata) rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len); #endif /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data, + retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, tdata->validCipherOffsetLenInBits.len + @@ -2535,7 +2535,7 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata) unsigned ciphertext_len; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_CIPHER_SNOW3G_UEA2, tdata->key.data, tdata->key.len); @@ -2559,7 +2559,7 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata) TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, tdata->iv.len, + retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, tdata->validCipherOffsetLenInBits.len, RTE_CRYPTO_CIPHER_SNOW3G_UEA2); @@ -2598,7 +2598,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata) unsigned ciphertext_len; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_DECRYPT, RTE_CRYPTO_CIPHER_SNOW3G_UEA2, tdata->key.data, tdata->key.len); @@ -2632,7 +2632,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata) TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data, + retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, tdata->validCipherOffsetLenInBits.len, @@ -2673,7 +2673,7 @@ test_snow3g_authenticated_encryption(const struct snow3g_test_data *tdata) unsigned plaintext_len; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_cipher_auth_session(ts_params->valid_devs[0], + retval = create_wireless_algo_cipher_auth_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_SNOW3G_UIA2, @@ -2699,7 +2699,7 @@ test_snow3g_authenticated_encryption(const struct snow3g_test_data *tdata) TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_cipher_hash_operation(tdata->digest.data, + retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data, tdata->digest.len, tdata->aad.data, tdata->aad.len, /*tdata->plaintext.len,*/ plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE, @@ -2757,7 +2757,7 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata) unsigned plaintext_len; /* Create SNOW3G session */ - retval = create_snow3g_kasumi_auth_cipher_session(ts_params->valid_devs[0], + retval = create_wireless_algo_auth_cipher_session(ts_params->valid_devs[0], RTE_CRYPTO_CIPHER_OP_ENCRYPT, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_SNOW3G_UIA2, @@ -2784,7 +2784,7 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata) TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len); /* Create SNOW3G operation */ - retval = create_snow3g_kasumi_auth_cipher_operation( + retval = create_wireless_algo_auth_cipher_operation( tdata->digest.len, tdata->iv.data, tdata->iv.len, tdata->aad.data, tdata->aad.len, -- 2.7.4