X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_cryptodev_snow3g_test_vectors.h;h=cb9dc4b35080a9adfa4908fb6a678905c9b363f0;hb=e9c659426416c95c4469b16e6bcc7700f1898278;hp=51917c14cbf55d28219dc0c01a3597cc626d8d78;hpb=a59ffe7eb952b5777419e880cb4330bb86f8d8ad;p=dpdk.git diff --git a/app/test/test_cryptodev_snow3g_test_vectors.h b/app/test/test_cryptodev_snow3g_test_vectors.h index 51917c14cb..cb9dc4b350 100644 --- a/app/test/test_cryptodev_snow3g_test_vectors.h +++ b/app/test/test_cryptodev_snow3g_test_vectors.h @@ -1,33 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2015 Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2015-2017 Intel Corporation */ #ifndef TEST_CRYPTODEV_SNOW3G_TEST_VECTORS_H_ @@ -42,7 +14,7 @@ struct snow3g_test_data { struct { uint8_t data[64] __rte_aligned(16); unsigned len; - } iv; + } cipher_iv; struct { uint8_t data[1024]; @@ -62,22 +34,14 @@ struct snow3g_test_data { unsigned len; } validCipherLenInBits; - struct { - unsigned len; - } validCipherOffsetLenInBits; - struct { unsigned len; } validAuthLenInBits; - struct { - unsigned len; - } validAuthOffsetLenInBits; - struct { uint8_t data[64]; unsigned len; - } aad; + } auth_iv; struct { uint8_t data[64]; @@ -92,7 +56,7 @@ struct snow3g_test_data snow3g_test_case_1 = { }, .len = 16 }, - .iv = { + .cipher_iv = { .data = { 0x72, 0xA4, 0xF2, 0x0F, 0x64, 0x00, 0x00, 0x00, 0x72, 0xA4, 0xF2, 0x0F, 0x64, 0x00, 0x00, 0x00 @@ -141,10 +105,7 @@ struct snow3g_test_data snow3g_test_case_1 = { .validCipherLenInBits = { .len = 800 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, - .aad = { + .auth_iv = { .data = { 0x72, 0xA4, 0xF2, 0x0F, 0x64, 0x00, 0x00, 0x00, 0x72, 0xA4, 0xF2, 0x0F, 0x64, 0x00, 0x00, 0x00 @@ -161,7 +122,7 @@ struct snow3g_test_data snow3g_test_case_2 = { }, .len = 16 }, - .iv = { + .cipher_iv = { .data = { 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00 @@ -200,10 +161,7 @@ struct snow3g_test_data snow3g_test_case_2 = { .validCipherLenInBits = { .len = 512 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, - .aad = { + .auth_iv = { .data = { 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00, 0xE2, 0x8B, 0xCF, 0x7B, 0xC0, 0x00, 0x00, 0x00 @@ -220,7 +178,7 @@ struct snow3g_test_data snow3g_test_case_3 = { }, .len = 16 }, - .iv = { + .cipher_iv = { .data = { 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 @@ -247,10 +205,7 @@ struct snow3g_test_data snow3g_test_case_3 = { .validCipherLenInBits = { .len = 120 }, - .validCipherOffsetLenInBits = { - .len = 128 - }, - .aad = { + .auth_iv = { .data = { 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00, 0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00 @@ -263,9 +218,6 @@ struct snow3g_test_data snow3g_test_case_3 = { }, .validAuthLenInBits = { .len = 120 - }, - .validAuthOffsetLenInBits = { - .len = 128 } }; @@ -277,7 +229,7 @@ struct snow3g_test_data snow3g_test_case_4 = { }, .len = 16 }, - .iv = { + .cipher_iv = { .data = { 0x39, 0x8A, 0x59, 0xB4, 0x2C, 0x00, 0x00, 0x00, 0x39, 0x8A, 0x59, 0xB4, 0x2C, 0x00, 0x00, 0x00 @@ -307,9 +259,6 @@ struct snow3g_test_data snow3g_test_case_4 = { }, .validCipherLenInBits = { .len = 256 - }, - .validCipherOffsetLenInBits = { - .len = 128 } }; @@ -321,7 +270,7 @@ struct snow3g_test_data snow3g_test_case_5 = { }, .len = 16 }, - .iv = { + .cipher_iv = { .data = { 0x72, 0xA4, 0xF2, 0x0F, 0x48, 0x00, 0x00, 0x00, 0x72, 0xA4, 0xF2, 0x0F, 0x48, 0x00, 0x00, 0x00 @@ -371,9 +320,6 @@ struct snow3g_test_data snow3g_test_case_5 = { .validCipherLenInBits = { .len = 840 }, - .validCipherOffsetLenInBits = { - .len = 128 - } }; struct snow3g_test_data snow3g_test_case_6 = { .key = { @@ -383,14 +329,14 @@ struct snow3g_test_data snow3g_test_case_6 = { }, .len = 16 }, - .iv = { + .cipher_iv = { .data = { 0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD, 0x94, 0x79, 0x3E, 0x41, 0x03, 0x97, 0x68, 0xFD }, .len = 16 }, - .aad = { + .auth_iv = { .data = { 0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD, 0x94, 0x79, 0x3E, 0x41, 0x03, 0x97, 0x68, 0xFD @@ -429,15 +375,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_ */