net/avf: align dynamic log names with standard

[dpdk.git] / test / test / test_cryptodev_zuc_test_vectors.h

diff --git a/test/test/test_cryptodev_zuc_test_vectors.h b/test/test/test_cryptodev_zuc_test_vectors.h
index 50fb538..9ff821a 100644 (file)
--- a/test/test/test_cryptodev_zuc_test_vectors.h
+++ b/test/test/test_cryptodev_zuc_test_vectors.h
@@ -1,33 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2016 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) 2016-2017 Intel Corporation
  */
 
 #ifndef TEST_CRYPTODEV_ZUC_TEST_VECTORS_H_
@@ -42,7 +14,7 @@ struct wireless_test_data {
        struct {
                uint8_t data[64] __rte_aligned(16);
                unsigned len;
-       } iv;
+       } cipher_iv;
 
        struct {
                uint8_t data[2048];
@@ -69,7 +41,7 @@ struct wireless_test_data {
        struct {
                uint8_t data[64];
                unsigned len;
-       } aad;
+       } auth_iv;
 
        struct {
                uint8_t data[64];
@@ -84,7 +56,7 @@ static struct wireless_test_data zuc_test_case_cipher_193b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00,
                        0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00
@@ -125,7 +97,7 @@ static struct wireless_test_data zuc_test_case_cipher_800b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0x00, 0x05, 0x68, 0x23, 0xC4, 0x00, 0x00, 0x00,
                        0x00, 0x05, 0x68, 0x23, 0xC4, 0x00, 0x00, 0x00
@@ -184,7 +156,7 @@ static struct wireless_test_data zuc_test_case_cipher_1570b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0x76, 0x45, 0x2E, 0xC1, 0x14, 0x00, 0x00, 0x00,
                        0x76, 0x45, 0x2E, 0xC1, 0x14, 0x00, 0x00, 0x00
@@ -267,7 +239,7 @@ static struct wireless_test_data zuc_test_case_cipher_2798b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0xE4, 0x85, 0x0F, 0xE1, 0x84, 0x00, 0x00, 0x00,
                        0xE4, 0x85, 0x0F, 0xE1, 0x84, 0x00, 0x00, 0x00
@@ -388,7 +360,7 @@ static struct wireless_test_data zuc_test_case_cipher_4019b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0x27, 0x38, 0xCD, 0xAA, 0xD0, 0x00, 0x00, 0x00,
                        0x27, 0x38, 0xCD, 0xAA, 0xD0, 0x00, 0x00, 0x00
@@ -547,7 +519,7 @@ static struct wireless_test_data zuc_test_case_cipher_200b_auth_200b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00,
                        0x66, 0x03, 0x54, 0x92, 0x78, 0x00, 0x00, 0x00
@@ -578,7 +550,7 @@ static struct wireless_test_data zuc_test_case_cipher_200b_auth_200b = {
        .validCipherLenInBits = {
                .len = 200
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00,
                        0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00
@@ -602,7 +574,7 @@ static struct wireless_test_data zuc_test_case_cipher_800b_auth_120b = {
                },
                .len = 16
        },
-       .iv = {
+       .cipher_iv = {
                .data = {
                        0x00, 0x05, 0x68, 0x23, 0xC4, 0x00, 0x00, 0x00,
                        0x00, 0x05, 0x68, 0x23, 0xC4, 0x00, 0x00, 0x00
@@ -651,7 +623,7 @@ static struct wireless_test_data zuc_test_case_cipher_800b_auth_120b = {
        .validCipherLenInBits = {
                .len = 800
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00,
                        0xFA, 0x55, 0x6B, 0x26, 0x1C, 0x00, 0x00, 0x00
@@ -675,7 +647,7 @@ struct wireless_test_data zuc_test_case_auth_1b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -703,7 +675,7 @@ struct wireless_test_data zuc_test_case_auth_90b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x56, 0x1E, 0xB2, 0xDD, 0xA0, 0x00, 0x00, 0x00,
                        0x56, 0x1E, 0xB2, 0xDD, 0xA0, 0x00, 0x00, 0x00
@@ -734,7 +706,7 @@ struct wireless_test_data zuc_test_case_auth_577b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0xA9, 0x40, 0x59, 0xDA, 0x50, 0x00, 0x00, 0x00,
                        0x29, 0x40, 0x59, 0xDA, 0x50, 0x00, 0x80, 0x00
@@ -773,7 +745,7 @@ struct wireless_test_data zuc_test_case_auth_2079b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x05, 0x09, 0x78, 0x50, 0x80, 0x00, 0x00, 0x00,
                        0x85, 0x09, 0x78, 0x50, 0x80, 0x00, 0x80, 0x00
@@ -835,7 +807,7 @@ struct wireless_test_data zuc_test_auth_5670b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x56, 0x1E, 0xB2, 0xDD, 0xE0, 0x00, 0x00, 0x00,
                        0x56, 0x1E, 0xB2, 0xDD, 0xE0, 0x00, 0x00, 0x00
@@ -950,7 +922,7 @@ static struct wireless_test_data zuc_test_case_auth_128b = {
                .data = { 0x0 },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = { 0x0 },
                .len = 16
        },
@@ -975,7 +947,7 @@ static struct wireless_test_data zuc_test_case_auth_2080b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x05, 0x09, 0x78, 0x50, 0x80, 0x00, 0x00, 0x00,
                        0x85, 0x09, 0x78, 0x50, 0x80, 0x00, 0x80, 0x00
@@ -1037,7 +1009,7 @@ static struct wireless_test_data zuc_test_case_auth_584b = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0xa9, 0x40, 0x59, 0xda, 0x50, 0x0, 0x0, 0x0,
                        0x29, 0x40, 0x59, 0xda, 0x50, 0x0, 0x80, 0x0