commit f2ffbc43878c971235253f815f3d1ce61012c92c
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Dec 01 09:57:55 2020 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Thu Dec 03 12:25:09 2020 +0100
tree 6c2c53103b30eee693eaa288860b89fca9d9c9b9
parent 53f10e70fda847ef8c4c80cb6877c83e58c03891

Stop supporting NIST_KW in cipher_auth_xxcrypt()

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

tests/suites/test_suite_cipher.function

diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 7ea1a14..543ccf6 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -1222,22 +1222,31 @@
                                tmp_cipher, cipher->len, output, &outlen,
                                tmp_tag, tag->len );
 
-    /* make sure the message is rejected if it should be */
-    if( strcmp( result, "FAIL" ) == 0 )
+    if( using_nist_kw )
     {
+        /* NIST_KW with legacy API */
+        TEST_ASSERT( ret == MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+    }
+    else if( strcmp( result, "FAIL" ) == 0 )
+    {
+        /* unauthentic message */
         TEST_ASSERT( ret == MBEDTLS_ERR_CIPHER_AUTH_FAILED );
     }
     else
     {
-        /* otherwise, make sure it was decrypted properly */
+        /* authentic message: is the plaintext correct? */
         TEST_ASSERT( ret == 0 );
 
         TEST_ASSERT( outlen == clear->len );
         TEST_ASSERT( memcmp( output, clear->x, clear->len ) == 0 );
+    }
 
-        /*
-         * Prepare context for encryption
-         */
+    /*
+     * Encrypt back if test data was authentic
+     */
+    if( strcmp( result, "FAIL" ) != 0 )
+    {
+        /* prepare context for encryption */
         cipher_reset_key( &ctx, cipher_id, use_psa, tag->len, key,
                           MBEDTLS_ENCRYPT );
 
@@ -1254,11 +1263,19 @@
         ret = mbedtls_cipher_auth_encrypt( &ctx, iv->x, iv->len, ad->x, ad->len,
                                    clear->x, clear->len, output, &outlen,
                                    output_tag, tag->len );
-        TEST_ASSERT( ret == 0 );
 
-        TEST_ASSERT( outlen == cipher->len );
-        TEST_ASSERT( memcmp( output, cipher->x, cipher->len ) == 0 );
-        TEST_ASSERT( memcmp( output_tag, tag->x, tag->len ) == 0 );
+        if( using_nist_kw )
+        {
+            TEST_ASSERT( ret == MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE );
+        }
+        else
+        {
+            TEST_ASSERT( ret == 0 );
+
+            TEST_ASSERT( outlen == cipher->len );
+            TEST_ASSERT( memcmp( output, cipher->x, cipher->len ) == 0 );
+            TEST_ASSERT( memcmp( output_tag, tag->x, tag->len ) == 0 );
+        }
     }
 
 exit: