commit 5d9b00dddbd4acd1c9eb0a472bfd4a01bc136be4
author Ronald Cron <ronald.cron@arm.com> Wed Mar 10 14:43:20 2021 +0100
committer Ronald Cron <ronald.cron@arm.com> Fri Mar 26 15:48:07 2021 +0100
tree b093a42aa79d6967ecefd5b56d9834ecccb58729
parent 3522e32132c77973355de78069d36cf2a17897c2

psa: cipher: Include Mbed TLS cipher driver only if necessary

Signed-off-by: Ronald Cron <ronald.cron@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 75ea6f5..765920f 100644
--- a/library/psa_crypto_driver_wrappers.c
+++ b/library/psa_crypto_driver_wrappers.c
@@ -741,6 +741,7 @@
                 return( status );
 #endif /* PSA_CRYPTO_DRIVER_TEST */
 #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
             /* Fell through, meaning no accelerator supports this operation */
             status = mbedtls_psa_cipher_encrypt_setup( &operation->ctx.mbedtls_ctx,
                                                        attributes,
@@ -751,6 +752,8 @@
                 operation->id = PSA_CRYPTO_MBED_TLS_DRIVER_ID;
 
             return( status );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
+            return( PSA_ERROR_NOT_SUPPORTED );
 
         /* Add cases for opaque driver here */
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
@@ -771,6 +774,9 @@
         default:
             /* Key is declared with a lifetime not known to us */
             (void)status;
+            (void)key_buffer;
+            (void)key_buffer_size;
+            (void)alg;
             return( PSA_ERROR_INVALID_ARGUMENT );
     }
 }
@@ -806,6 +812,7 @@
                 return( status );
 #endif /* PSA_CRYPTO_DRIVER_TEST */
 #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
             /* Fell through, meaning no accelerator supports this operation */
             status = mbedtls_psa_cipher_decrypt_setup( &operation->ctx.mbedtls_ctx,
                                                        attributes,
@@ -816,6 +823,8 @@
                 operation->id = PSA_CRYPTO_MBED_TLS_DRIVER_ID;
 
             return( status );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
+            return( PSA_ERROR_NOT_SUPPORTED );
 
         /* Add cases for opaque driver here */
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
@@ -836,6 +845,9 @@
         default:
             /* Key is declared with a lifetime not known to us */
             (void)status;
+            (void)key_buffer;
+            (void)key_buffer_size;
+            (void)alg;
             return( PSA_ERROR_INVALID_ARGUMENT );
     }
 }
@@ -848,11 +860,14 @@
 {
     switch( operation->id )
     {
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
         case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
             return( mbedtls_psa_cipher_generate_iv( &operation->ctx.mbedtls_ctx,
                                                     iv,
                                                     iv_size,
                                                     iv_length ) );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
+
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
@@ -870,6 +885,10 @@
 #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
     }
 
+    (void)iv;
+    (void)iv_size;
+    (void)iv_length;
+
     return( PSA_ERROR_INVALID_ARGUMENT );
 }
 
@@ -880,10 +899,12 @@
 {
     switch( operation->id )
     {
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
         case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
             return( mbedtls_psa_cipher_set_iv( &operation->ctx.mbedtls_ctx,
                                                iv,
                                                iv_length ) );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
 
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)
@@ -900,6 +921,9 @@
 #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
     }
 
+    (void)iv;
+    (void)iv_length;
+
     return( PSA_ERROR_INVALID_ARGUMENT );
 }
 
@@ -913,6 +937,7 @@
 {
     switch( operation->id )
     {
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
         case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
             return( mbedtls_psa_cipher_update( &operation->ctx.mbedtls_ctx,
                                                input,
@@ -920,6 +945,8 @@
                                                output,
                                                output_size,
                                                output_length ) );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
+
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)
         case PSA_CRYPTO_TRANSPARENT_TEST_DRIVER_ID:
@@ -937,6 +964,12 @@
 #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
     }
 
+    (void)input;
+    (void)input_length;
+    (void)output;
+    (void)output_size;
+    (void)output_length;
+
     return( PSA_ERROR_INVALID_ARGUMENT );
 }
 
@@ -948,12 +981,13 @@
 {
     switch( operation->id )
     {
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
         case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
             return( mbedtls_psa_cipher_finish( &operation->ctx.mbedtls_ctx,
                                                output,
                                                output_size,
                                                output_length ) );
-
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
 
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)
@@ -970,6 +1004,10 @@
 #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */
     }
 
+    (void)output;
+    (void)output_size;
+    (void)output_length;
+
     return( PSA_ERROR_INVALID_ARGUMENT );
 }
 
@@ -980,8 +1018,10 @@
 
     switch( operation->id )
     {
+#if defined(MBEDTLS_PSA_BUILTIN_CIPHER)
         case PSA_CRYPTO_MBED_TLS_DRIVER_ID:
             return( mbedtls_psa_cipher_abort( &operation->ctx.mbedtls_ctx ) );
+#endif /* MBEDTLS_PSA_BUILTIN_CIPHER */
 
 #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)
 #if defined(PSA_CRYPTO_DRIVER_TEST)