commit 8593bca7f8bc37ef4ceada556fe4fd1e48ce1f59
author Darryl Green <darryl.green@arm.com> Mon Feb 11 11:45:58 2019 +0000
committer Darryl Green <darryl.green@arm.com> Mon Feb 11 13:26:36 2019 +0000
tree 4c1f62a5f2829ccc399eebb219fba55130e1c839
parent 2a0f48ae1fe511565d20f04f8418bce8272dac05

Allow NULL buffers in psa_copy_key_material when the key size is zero

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index d9d4870..0864031 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1227,7 +1227,7 @@
     buffer_size = PSA_KEY_EXPORT_MAX_SIZE( source->type,
                                            psa_get_key_bits( source ) );
     buffer = mbedtls_calloc( 1, buffer_size );
-    if( buffer == NULL )
+    if( buffer == NULL && buffer_size != 0 )
         return( PSA_ERROR_INSUFFICIENT_MEMORY );
     status = psa_internal_export_key( source, buffer, buffer_size, &length, 0 );
     if( status != PSA_SUCCESS )