Skip to contentSkip to conversation

examples/fips_validation: fix incorrect structure used for AES-GCM

PATCH Applied Anoob Joseph 2 participants 2 messages Nov 27, 2019 – Nov 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 examples/fips_validation: fix incorrect structure used for AES-GCM

From: Sucharitha Sarananaga <[email protected]>

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")
---
 examples/fips_validation/fips_validation_gcm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
examples/fips_validation/fips_validation_gcm.c +8 -8
index 0509b10..ea48ddf 100644
@@ -34,29 +34,29 @@
 #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 */
 };
 
Signature · 1 line
2.7.4
#1 lore raw

27/11/2019 06:00, Anoob Joseph:

Quoted 11 lines

From: Sucharitha Sarananaga <[email protected]>

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")

Applied, thanks