commit 4bbe82bdcc606672bda65dc4a3bcd57b2894a185
author Paul Elliott <paul.elliott@arm.com> Tue Apr 27 12:11:56 2021 +0100
committer Paul Elliott <paul.elliott@arm.com> Fri May 14 19:03:26 2021 +0100
tree 716a3c282e37d95153ab7fef8119c1e2d58b6eb8
parent 0023e0a1de4f0392125c2b5f3e15e13506abbb35

Add transparent driver tests for M-AEAD

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

library/psa_crypto_driver_wrappers.c

diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c
index 91ad37f..ce49a22 100644
--- a/library/psa_crypto_driver_wrappers.c
+++ b/library/psa_crypto_driver_wrappers.c
@@ -1311,10 +1311,10 @@
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)
             status = PSA_ERROR_NOT_SUPPORTED;
-//          status = test_transparent_aead_encrypt_setup(
-//                      operation, attributes,
-//                      key_buffer, key_buffer_size,
-//                      alg );
+            status = test_transparent_aead_encrypt_setup(
+                        operation, attributes,
+                        key_buffer, key_buffer_size,
+                        alg );
             /* Declared with fallback == true */
             if( status == PSA_SUCCESS )
                 operation->id = PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID;
@@ -1363,10 +1363,10 @@
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)
             status = PSA_ERROR_NOT_SUPPORTED;
-//          status = test_transparent_aead_decrypt_setup(
-//                      operation, attributes,
-//                      key_buffer, key_buffer_size,
-//                      alg );
+            status = test_transparent_aead_decrypt_setup(
+                        operation, attributes,
+                        key_buffer, key_buffer_size,
+                        alg );
             /* Declared with fallback == true */
             if( status == PSA_SUCCESS )
                 operation->id = PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID;
@@ -1413,8 +1413,8 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_set_nonce(
-//                      operation, nonce, nonce_length ) );
+            return( test_transparent_aead_set_nonce(
+                        operation, nonce, nonce_length ) );
 
         /* Add cases for opaque driver here */
 
@@ -1445,8 +1445,8 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_set_lengths(
-//                      operation, ad_length, plaintext_length ) );
+            return( test_transparent_aead_set_lengths(
+                        operation, ad_length, plaintext_length ) );
 
         /* Add cases for opaque driver here */
 
@@ -1477,8 +1477,8 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_update_ad(
-//                      operation, input, input_length ) );
+            return( test_transparent_aead_update_ad(
+                        operation, input, input_length ) );
 
         /* Add cases for opaque driver here */
 
@@ -1513,9 +1513,9 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_update(
-//                      operation, input, input_length, ouput, output_size,
-//                      output_length ) );
+            return( test_transparent_aead_update(
+                        operation, input, input_length, output, output_size,
+                        output_length ) );
 
         /* Add cases for opaque driver here */
 
@@ -1554,9 +1554,9 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_finish(
-//                      operation, ciphertext, ciphertext_size,
-//                      ciphertext_length, tag, tag_size, tag_length ) );
+            return( test_transparent_aead_finish(
+                        operation, ciphertext, ciphertext_size,
+                        ciphertext_length, tag, tag_size, tag_length ) );
 
         /* Add cases for opaque driver here */
 
@@ -1595,9 +1595,9 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_verify(
-//                      operation, ciphertext, ciphertext_size,
-//                      ciphertext_length, tag, tag_length ) );
+            return( test_transparent_aead_verify(
+                        operation, plaintext, plaintext_size,
+                        plaintext_length, tag, tag_length ) );
 
         /* Add cases for opaque driver here */
 
@@ -1629,7 +1629,7 @@
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
             return( PSA_ERROR_NOT_SUPPORTED );
-//          return( test_transparent_aead_abort( operation ) );
+            return( test_transparent_aead_abort( operation ) );
 
         /* Add cases for opaque driver here */