From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pablo de Lara Subject: [PATCH 4/9] test/crypto: remove offsets in wireless algorithm vectors Date: Wed, 21 Jun 2017 07:41:49 +0100 Message-ID: <20170621064154.25124-5-pablo.de.lara.guarch@intel.com> References: <20170621064154.25124-1-pablo.de.lara.guarch@intel.com> Cc: dev@dpdk.org, Pablo de Lara To: declan.doherty@intel.com Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 8C76A7CEB for ; Wed, 21 Jun 2017 16:41:43 +0200 (CEST) In-Reply-To: <20170621064154.25124-1-pablo.de.lara.guarch@intel.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Instead of passing the authentication and cipher offset from the test vectors, just get them from the IV and AAD lengths. Signed-off-by: Pablo de Lara --- test/test/test_cryptodev.c | 59 ++++++++++----------- .../test/test_cryptodev_kasumi_hash_test_vectors.h | 25 --------- test/test/test_cryptodev_kasumi_test_vectors.h | 36 +------------ .../test/test_cryptodev_snow3g_hash_test_vectors.h | 22 -------- test/test/test_cryptodev_snow3g_test_vectors.h | 32 ------------ test/test/test_cryptodev_zuc_test_vectors.h | 61 +--------------------- 6 files changed, 32 insertions(+), 203 deletions(-) diff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c index 029ce8a..eed7385 100644 --- a/test/test/test_cryptodev.c +++ b/test/test/test_cryptodev.c @@ -2180,10 +2180,9 @@ create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata, const uint8_t *iv = tdata->iv.data; const uint8_t iv_len = tdata->iv.len; const unsigned int cipher_len = tdata->validCipherLenInBits.len; - const unsigned int cipher_offset = - tdata->validCipherOffsetLenInBits.len; + const unsigned int cipher_offset = tdata->iv.len << 3; const unsigned int auth_len = tdata->validAuthLenInBits.len; - const unsigned int auth_offset = tdata->validAuthOffsetLenInBits.len; + const unsigned int auth_offset = tdata->aad.len << 3; unsigned int iv_pad_len = 0; unsigned int aad_buffer_len; @@ -2506,7 +2505,7 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata) plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_SNOW3G_UIA2, tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len); + (tdata->aad.len << 3)); if (retval < 0) return retval; @@ -2568,7 +2567,7 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata) RTE_CRYPTO_AUTH_OP_VERIFY, RTE_CRYPTO_AUTH_SNOW3G_UIA2, tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len); + (tdata->aad.len << 3)); if (retval < 0) return retval; @@ -2628,7 +2627,7 @@ test_kasumi_authentication(const struct kasumi_hash_test_data *tdata) plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_KASUMI_F9, tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len); + (tdata->aad.len << 3)); if (retval < 0) return retval; @@ -2690,7 +2689,7 @@ test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata) RTE_CRYPTO_AUTH_OP_VERIFY, RTE_CRYPTO_AUTH_KASUMI_F9, tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len); + (tdata->aad.len << 3)); if (retval < 0) return retval; @@ -2887,7 +2886,7 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata) /* Create KASUMI operation */ retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_KASUMI_F8); if (retval < 0) return retval; @@ -2961,7 +2960,7 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata) retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_KASUMI_F8); if (retval < 0) return retval; @@ -3032,7 +3031,7 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_KASUMI_F8); if (retval < 0) return retval; @@ -3107,7 +3106,7 @@ test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_KASUMI_F8); if (retval < 0) return retval; @@ -3175,7 +3174,7 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->ciphertext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_KASUMI_F8); if (retval < 0) return retval; @@ -3241,7 +3240,7 @@ test_kasumi_decryption(const struct kasumi_test_data *tdata) retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->ciphertext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_KASUMI_F8); if (retval < 0) return retval; @@ -3306,7 +3305,7 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata) /* Create SNOW 3G operation */ retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_SNOW3G_UEA2); if (retval < 0) return retval; @@ -3380,7 +3379,7 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_SNOW3G_UEA2); if (retval < 0) return retval; @@ -3457,7 +3456,7 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_SNOW3G_UEA2); if (retval < 0) return retval; @@ -3560,7 +3559,7 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len + + (tdata->iv.len << 3) + extra_offset, RTE_CRYPTO_CIPHER_SNOW3G_UEA2); if (retval < 0) @@ -3639,7 +3638,7 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata) /* Create SNOW 3G operation */ retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_SNOW3G_UEA2); if (retval < 0) return retval; @@ -3713,7 +3712,7 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata) retval = create_wireless_algo_cipher_operation_oop(tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_SNOW3G_UEA2); if (retval < 0) return retval; @@ -3872,9 +3871,9 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata) RTE_CRYPTO_CIPHER_SNOW3G_UEA2, tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len + (tdata->aad.len << 3) ); if (retval < 0) return retval; @@ -3954,9 +3953,9 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata) tdata->aad.data, tdata->aad.len, plaintext_pad_len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len, + (tdata->aad.len << 3), RTE_CRYPTO_AUTH_SNOW3G_UIA2, RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ); @@ -4039,9 +4038,9 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata) tdata->aad.data, tdata->aad.len, plaintext_pad_len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len, + (tdata->aad.len << 3), RTE_CRYPTO_AUTH_KASUMI_F9, RTE_CRYPTO_CIPHER_KASUMI_F8 ); @@ -4126,9 +4125,9 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata) RTE_CRYPTO_CIPHER_KASUMI_F8, tdata->iv.data, tdata->iv.len, tdata->validCipherLenInBits.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len + (tdata->aad.len << 3) ); if (retval < 0) return retval; @@ -4210,7 +4209,7 @@ test_zuc_encryption(const struct wireless_test_data *tdata) /* Create ZUC operation */ retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_ZUC_EEA3); if (retval < 0) return retval; @@ -4295,7 +4294,7 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata) /* Create ZUC operation */ retval = create_wireless_algo_cipher_operation(tdata->iv.data, tdata->iv.len, tdata->plaintext.len, - tdata->validCipherOffsetLenInBits.len, + (tdata->iv.len << 3), RTE_CRYPTO_CIPHER_ZUC_EEA3); if (retval < 0) return retval; @@ -4375,7 +4374,7 @@ test_zuc_authentication(const struct wireless_test_data *tdata) plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3, tdata->validAuthLenInBits.len, - tdata->validAuthOffsetLenInBits.len); + (tdata->aad.len << 3)); if (retval < 0) return retval; diff --git a/test/test/test_cryptodev_kasumi_hash_test_vectors.h b/test/test/test_cryptodev_kasumi_hash_test_vectors.h index 69742fa..63db9c4 100644 --- a/test/test/test_cryptodev_kasumi_hash_test_vectors.h +++ b/test/test/test_cryptodev_kasumi_hash_test_vectors.h @@ -58,10 +58,6 @@ struct kasumi_hash_test_data { } validAuthLenInBits; struct { - unsigned len; - } validAuthOffsetLenInBits; - - struct { uint8_t data[64]; unsigned len; } digest; @@ -92,9 +88,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_1 = { .validAuthLenInBits = { .len = 189 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0xF6, 0x3B, 0xD7, 0x2C}, .len = 4 @@ -127,9 +120,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_2 = { .validAuthLenInBits = { .len = 254 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0xA9, 0xDA, 0xF1, 0xFF}, .len = 4 @@ -164,9 +154,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_3 = { .validAuthLenInBits = { .len = 319 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0x15, 0x37, 0xD3, 0x16}, .len = 4 @@ -202,9 +189,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_4 = { .validAuthLenInBits = { .len = 384 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0xDD, 0x7D, 0xFA, 0xDD }, .len = 4 @@ -249,9 +233,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_5 = { .validAuthLenInBits = { .len = 1000 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0xC3, 0x83, 0x83, 0x9D}, .len = 4 @@ -293,9 +274,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_6 = { .validAuthLenInBits = { .len = 768 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0x95, 0xAE, 0x41, 0xBA}, .len = 4 @@ -326,9 +304,6 @@ struct kasumi_hash_test_data kasumi_hash_test_case_7 = { .validAuthLenInBits = { .len = 120 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0x87, 0x5F, 0xE4, 0x89}, .len = 4 diff --git a/test/test/test_cryptodev_kasumi_test_vectors.h b/test/test/test_cryptodev_kasumi_test_vectors.h index ef1dc6f..6a7efb8 100644 --- a/test/test/test_cryptodev_kasumi_test_vectors.h +++ b/test/test/test_cryptodev_kasumi_test_vectors.h @@ -68,20 +68,12 @@ struct kasumi_test_data { unsigned len; } validCipherLenInBits; - struct { - unsigned len; - } validCipherOffsetLenInBits; - /* Actual length of data to be hashed */ struct { unsigned len; } validAuthLenInBits; struct { - unsigned len; - } validAuthOffsetLenInBits; - - struct { uint8_t data[64]; unsigned len; } digest; @@ -140,10 +132,7 @@ struct kasumi_test_data kasumi_test_case_1 = { }, .validCipherLenInBits = { .len = 798 - }, - .validCipherOffsetLenInBits = { - .len = 64 - }, + } }; struct kasumi_test_data kasumi_test_case_2 = { @@ -188,9 +177,6 @@ struct kasumi_test_data kasumi_test_case_2 = { }, .validCipherLenInBits = { .len = 510 - }, - .validCipherOffsetLenInBits = { - .len = 64 } }; @@ -234,15 +220,9 @@ struct kasumi_test_data kasumi_test_case_3 = { .validCipherLenInBits = { .len = 120 }, - .validCipherOffsetLenInBits = { - .len = 64 - }, .validAuthLenInBits = { .len = 120 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0x87, 0x5F, 0xE4, 0x89}, .len = 4 @@ -283,9 +263,6 @@ struct kasumi_test_data kasumi_test_case_4 = { }, .validCipherLenInBits = { .len = 253 - }, - .validCipherOffsetLenInBits = { - .len = 64 } }; @@ -343,10 +320,7 @@ struct kasumi_test_data kasumi_test_case_5 = { }, .validCipherLenInBits = { .len = 837 - }, - .validCipherOffsetLenInBits = { - .len = 64 - }, + } }; struct kasumi_test_data kasumi_test_case_6 = { @@ -389,15 +363,9 @@ struct kasumi_test_data kasumi_test_case_6 = { .validCipherLenInBits = { .len = 120 }, - .validCipherOffsetLenInBits = { - .len = 64 - }, .validAuthLenInBits = { .len = 120 }, - .validAuthOffsetLenInBits = { - .len = 64 - }, .digest = { .data = {0x0F, 0xD2, 0xAA, 0xB5}, .len = 4 diff --git a/test/test/test_cryptodev_snow3g_hash_test_vectors.h b/test/test/test_cryptodev_snow3g_hash_test_vectors.h index a8a47db..e88e7ab 100644 --- a/test/test/test_cryptodev_snow3g_hash_test_vectors.h +++ b/test/test/test_cryptodev_snow3g_hash_test_vectors.h @@ -54,10 +54,6 @@ struct snow3g_hash_test_data { } validAuthLenInBits; struct { - unsigned len; - } validAuthOffsetLenInBits; - - struct { uint8_t data[64]; unsigned len; } digest; @@ -92,9 +88,6 @@ struct snow3g_hash_test_data snow3g_hash_test_case_1 = { .validAuthLenInBits = { .len = 384 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x38, 0xB5, 0x54, 0xC0 }, .len = 4 @@ -140,9 +133,6 @@ struct snow3g_hash_test_data snow3g_hash_test_case_2 = { .validAuthLenInBits = { .len = 1000 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x06, 0x17, 0x45, 0xAE}, .len = 4 @@ -429,9 +419,6 @@ struct snow3g_hash_test_data snow3g_hash_test_case_3 = { .validAuthLenInBits = { .len = 16448 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x17, 0x9F, 0x2F, 0xA6}, .len = 4 @@ -464,9 +451,6 @@ struct snow3g_hash_test_data snow3g_hash_test_case_4 = { .validAuthLenInBits = { .len = 189 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x2B, 0xCE, 0x18, 0x20}, .len = 4 @@ -500,9 +484,6 @@ struct snow3g_hash_test_data snow3g_hash_test_case_5 = { .validAuthLenInBits = { .len = 254 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0xFC, 0x7B, 0x18, 0xBD}, .len = 4 @@ -537,9 +518,6 @@ struct snow3g_hash_test_data snow3g_hash_test_case_6 = { .validAuthLenInBits = { .len = 319 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x02, 0xF1, 0xFA, 0xAF}, .len = 4 diff --git a/test/test/test_cryptodev_snow3g_test_vectors.h b/test/test/test_cryptodev_snow3g_test_vectors.h index 51917c1..0c8ad1c 100644 --- a/test/test/test_cryptodev_snow3g_test_vectors.h +++ b/test/test/test_cryptodev_snow3g_test_vectors.h @@ -64,17 +64,9 @@ struct snow3g_test_data { struct { unsigned len; - } validCipherOffsetLenInBits; - - struct { - unsigned len; } validAuthLenInBits; struct { - unsigned len; - } validAuthOffsetLenInBits; - - struct { uint8_t data[64]; unsigned len; } aad; @@ -141,9 +133,6 @@ struct snow3g_test_data snow3g_test_case_1 = { .validCipherLenInBits = { .len = 800 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, .aad = { .data = { 0x72, 0xA4, 0xF2, 0x0F, 0x64, 0x00, 0x00, 0x00, @@ -200,9 +189,6 @@ struct snow3g_test_data snow3g_test_case_2 = { .validCipherLenInBits = { .len = 512 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, .aad = { .data = { 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00, @@ -247,9 +233,6 @@ struct snow3g_test_data snow3g_test_case_3 = { .validCipherLenInBits = { .len = 120 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, .aad = { .data = { 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, @@ -263,9 +246,6 @@ struct snow3g_test_data snow3g_test_case_3 = { }, .validAuthLenInBits = { .len = 120 - }, - .validAuthOffsetLenInBits = { - .len = 128 } }; @@ -307,9 +287,6 @@ struct snow3g_test_data snow3g_test_case_4 = { }, .validCipherLenInBits = { .len = 256 - }, - .validCipherOffsetLenInBits = { - .len = 128 } }; @@ -371,9 +348,6 @@ struct snow3g_test_data snow3g_test_case_5 = { .validCipherLenInBits = { .len = 840 }, - .validCipherOffsetLenInBits = { - .len = 128 - } }; struct snow3g_test_data snow3g_test_case_6 = { .key = { @@ -429,15 +403,9 @@ struct snow3g_test_data snow3g_test_case_6 = { .validCipherLenInBits = { .len = 384 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, .validAuthLenInBits = { .len = 384 }, - .validAuthOffsetLenInBits = { - .len = 128 - } }; #endif /* TEST_CRYPTODEV_SNOW3G_TEST_VECTORS_H_ */ diff --git a/test/test/test_cryptodev_zuc_test_vectors.h b/test/test/test_cryptodev_zuc_test_vectors.h index a900e91..50fb538 100644 --- a/test/test/test_cryptodev_zuc_test_vectors.h +++ b/test/test/test_cryptodev_zuc_test_vectors.h @@ -64,17 +64,9 @@ struct wireless_test_data { struct { unsigned len; - } validCipherOffsetLenInBits; - - struct { - unsigned len; } validAuthLenInBits; struct { - unsigned len; - } validAuthOffsetLenInBits; - - struct { uint8_t data[64]; unsigned len; } aad; @@ -122,9 +114,6 @@ static struct wireless_test_data zuc_test_case_cipher_193b = { }, .validCipherLenInBits = { .len = 193 - }, - .validCipherOffsetLenInBits = { - .len = 128 } }; @@ -184,9 +173,6 @@ static struct wireless_test_data zuc_test_case_cipher_800b = { }, .validCipherLenInBits = { .len = 800 - }, - .validCipherOffsetLenInBits = { - .len = 128 } }; @@ -270,10 +256,7 @@ static struct wireless_test_data zuc_test_case_cipher_1570b = { }, .validCipherLenInBits = { .len = 1570 - }, - .validCipherOffsetLenInBits = { - .len = 128 - }, + } }; static struct wireless_test_data zuc_test_case_cipher_2798b = { @@ -394,9 +377,6 @@ static struct wireless_test_data zuc_test_case_cipher_2798b = { }, .validCipherLenInBits = { .len = 2798 - }, - .validCipherOffsetLenInBits = { - .len = 128 } }; @@ -556,9 +536,6 @@ static struct wireless_test_data zuc_test_case_cipher_4019b = { }, .validCipherLenInBits = { .len = 4019 - }, - .validCipherOffsetLenInBits = { - .len = 128 } }; @@ -601,9 +578,6 @@ static struct wireless_test_data zuc_test_case_cipher_200b_auth_200b = { .validCipherLenInBits = { .len = 200 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, .aad = { .data = { 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, @@ -617,9 +591,6 @@ static struct wireless_test_data zuc_test_case_cipher_200b_auth_200b = { }, .validAuthLenInBits = { .len = 200 - }, - .validAuthOffsetLenInBits = { - .len = 128 } }; @@ -680,9 +651,6 @@ static struct wireless_test_data zuc_test_case_cipher_800b_auth_120b = { .validCipherLenInBits = { .len = 800 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, .aad = { .data = { 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, @@ -696,9 +664,6 @@ static struct wireless_test_data zuc_test_case_cipher_800b_auth_120b = { }, .validAuthLenInBits = { .len = 120 - }, - .validAuthOffsetLenInBits = { - .len = 128 } }; @@ -724,9 +689,6 @@ struct wireless_test_data zuc_test_case_auth_1b = { .validAuthLenInBits = { .len = 1 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0xC8, 0xA9, 0x59, 0x5E}, .len = 4 @@ -758,9 +720,6 @@ struct wireless_test_data zuc_test_case_auth_90b = { .validAuthLenInBits = { .len = 90 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x67, 0x19, 0xA0, 0x88}, .len = 4 @@ -800,9 +759,6 @@ struct wireless_test_data zuc_test_case_auth_577b = { .validAuthLenInBits = { .len = 577 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0xFA, 0xE8, 0xFF, 0x0B}, .len = 4 @@ -865,9 +821,6 @@ struct wireless_test_data zuc_test_case_auth_2079b = { .validAuthLenInBits = { .len = 2079 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x00, 0x4A, 0xC4, 0xD6}, .len = 4 @@ -986,9 +939,6 @@ struct wireless_test_data zuc_test_auth_5670b = { .validAuthLenInBits = { .len = 5670 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x0C, 0xA1, 0x27, 0x92}, .len = 4 @@ -1011,9 +961,6 @@ static struct wireless_test_data zuc_test_case_auth_128b = { .validAuthLenInBits = { .len = 8 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = { 0x39, 0x0a, 0x91, 0xb7 }, .len = 4 @@ -1076,9 +1023,6 @@ static struct wireless_test_data zuc_test_case_auth_2080b = { .validAuthLenInBits = { .len = 2080 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x03, 0x95, 0x32, 0xe1}, .len = 4 @@ -1118,9 +1062,6 @@ static struct wireless_test_data zuc_test_case_auth_584b = { .validAuthLenInBits = { .len = 584 }, - .validAuthOffsetLenInBits = { - .len = 128 - }, .digest = { .data = {0x24, 0xa8, 0x42, 0xb3}, .len = 4 -- 2.9.4