examples/fips_validation: fix vectors for AES-GCM
authorSucharitha Sarananaga <ssarananaga@marvell.com>
Wed, 27 Nov 2019 05:00:48 +0000 (10:30 +0530)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 28 Nov 2019 15:09:48 +0000 (16:09 +0100)
Test vectors for AES-GCM need to be populated by using aead member
and not cipher_auth. Using incorrect member would result in failures
when AES-GCM with non-zero AAD is tried.

Bugzilla ID: 360
Fixes: 4aaad2995e13 ("examples/fips_validation: support GCM parsing")

Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Signed-off-by: Sucharitha Sarananaga <ssarananaga@marvell.com>
examples/fips_validation/fips_validation_gcm.c

index 0509b10..ea48ddf 100644 (file)
 #define NEG_TEST_STR   "FAIL"
 
 struct fips_test_callback gcm_dec_vectors[] = {
-               {KEY_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.key},
+               {KEY_STR, parse_uint8_known_len_hex_str, &vec.aead.key},
                {IV_STR, parse_uint8_known_len_hex_str, &vec.iv},
                {CT_STR, parse_uint8_known_len_hex_str, &vec.ct},
-               {AAD_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.aad},
+               {AAD_STR, parse_uint8_known_len_hex_str, &vec.aead.aad},
                {TAG_STR, parse_uint8_known_len_hex_str,
-                               &vec.cipher_auth.digest},
+                               &vec.aead.digest},
                {NULL, NULL, NULL} /**< end pointer */
 };
 struct fips_test_callback gcm_interim_vectors[] = {
-               {KEYLEN_STR, parser_read_uint32_bit_val, &vec.cipher_auth.key},
+               {KEYLEN_STR, parser_read_uint32_bit_val, &vec.aead.key},
                {IVLEN_STR, parser_read_uint32_bit_val, &vec.iv},
                {PTLEN_STR, parser_read_uint32_bit_val, &vec.pt},
-               {AADLEN_STR, parser_read_uint32_bit_val, &vec.cipher_auth.aad},
+               {AADLEN_STR, parser_read_uint32_bit_val, &vec.aead.aad},
                {TAGLEN_STR, parser_read_uint32_bit_val,
-                               &vec.cipher_auth.digest},
+                               &vec.aead.digest},
                {NULL, NULL, NULL} /**< end pointer */
 };
 
 struct fips_test_callback gcm_enc_vectors[] = {
-               {KEY_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.key},
+               {KEY_STR, parse_uint8_known_len_hex_str, &vec.aead.key},
                {IV_STR, parse_uint8_known_len_hex_str, &vec.iv},
                {PT_STR, parse_uint8_known_len_hex_str, &vec.pt},
-               {AAD_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.aad},
+               {AAD_STR, parse_uint8_known_len_hex_str, &vec.aead.aad},
                {NULL, NULL, NULL} /**< end pointer */
 };