New upstream version 17.08

[deb_dpdk.git] / test / test / test_cryptodev_snow3g_hash_test_vectors.h

diff --git a/test/test/test_cryptodev_snow3g_hash_test_vectors.h b/test/test/test_cryptodev_snow3g_hash_test_vectors.h
index a8a47db..0bb274d 100644 (file)
--- a/test/test/test_cryptodev_snow3g_hash_test_vectors.h
+++ b/test/test/test_cryptodev_snow3g_hash_test_vectors.h
@@ -1,7 +1,7 @@
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2016-2017 Intel Corporation. All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -42,7 +42,7 @@ struct snow3g_hash_test_data {
        struct {
                uint8_t data[64];
                unsigned len;
-       } aad;
+       } auth_iv;
 
        struct {
                uint8_t data[2056];
@@ -53,10 +53,6 @@ struct snow3g_hash_test_data {
                unsigned len;
        } validAuthLenInBits;
 
-       struct {
-               unsigned len;
-       } validAuthOffsetLenInBits;
-
        struct {
                uint8_t data[64];
                unsigned len;
@@ -71,7 +67,7 @@ struct snow3g_hash_test_data snow3g_hash_test_case_1 = {
                },
        .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x14, 0x79, 0x3E, 0x41, 0x03, 0x97, 0xE8, 0xFD,
                        0x94, 0x79, 0x3E, 0x41, 0x03, 0x97, 0x68, 0xFD
@@ -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
@@ -109,7 +102,7 @@ struct snow3g_hash_test_data snow3g_hash_test_case_2 = {
                },
        .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x29, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0x77, 0x37,
                        0xA9, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0xF7, 0x37
@@ -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
@@ -157,7 +147,7 @@ struct snow3g_hash_test_data snow3g_hash_test_case_3 = {
                },
        .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x29, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0x77, 0x37,
                        0xA9, 0x6F, 0x39, 0x3C, 0x6B, 0x22, 0xF7, 0x37
@@ -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
@@ -446,7 +433,7 @@ struct snow3g_hash_test_data snow3g_hash_test_case_4 = {
                },
        .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x38, 0xA6, 0xF0, 0x56, 0x05, 0xD2, 0xEC, 0x49,
                        0x38, 0xA6, 0xF0, 0x56, 0x05, 0xD2, 0xEC, 0x49,
@@ -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
@@ -481,7 +465,7 @@ struct snow3g_hash_test_data snow3g_hash_test_case_5 = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x3E, 0xDC, 0x87, 0xE2, 0xA4, 0xF2, 0xD8, 0xE2,
                        0xBE, 0xDC, 0x87, 0xE2, 0xA4, 0xF2, 0x58, 0xE2
@@ -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
@@ -517,7 +498,7 @@ struct snow3g_hash_test_data snow3g_hash_test_case_6 = {
                },
                .len = 16
        },
-       .aad = {
+       .auth_iv = {
                .data = {
                        0x36, 0xAF, 0x61, 0x44, 0x98, 0x38, 0xF0, 0x3A,
                        0xB6, 0xAF, 0x61, 0x44, 0x98, 0x38, 0x70, 0x3A
@@ -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