commit 060ad8ac345b62c2b733345a575df22ccac3eb0e
author mohammad1603 <mohammad.abomokh@arm.com> Tue Mar 20 14:28:38 2018 -0700
committer itayzafrir <itay.zafrir@arm.com> Wed Sep 05 12:01:37 2018 +0300
tree 071138e2c4708616f4e589bbb224145b4ab1f8c3
parent 804cd71bf8b5d01c1caaea1a482a7b50cf035104

Compilation and tests fixes

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 5ba60e1..329ee3d 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -1304,7 +1304,7 @@
     if ( slot->lifetime == PSA_KEY_LIFETIME_WRITE_ONCE )
         return( PSA_ERROR_KEY_LIFETIME_CHANGE );
         
-    slot->lifetime = liftime;
+    slot->lifetime = lifetime;
 
     return( PSA_SUCCESS );
 }

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index d8dddff..b4bf660 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -370,8 +370,6 @@
     psa_key_lifetime_t lifetime_set = (psa_key_lifetime_t) lifetime_arg;
     psa_key_lifetime_t lifetime_get;
 
-    TEST_ASSERT( key != NULL );
-
     memset( key, 0x2a, sizeof( key ) );
  
     TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
@@ -379,14 +377,15 @@
     TEST_ASSERT( psa_import_key( key_slot, key_type,
                                  key, sizeof( key ) ) == PSA_SUCCESS );
 
-    TEST_ASSERT( psa_set_key_lifetime( key_slot, lifetime_set ));
+    TEST_ASSERT( psa_set_key_lifetime( key_slot, 
+								 lifetime_set ) == PSA_SUCCESS );
     
-    TEST_ASSERT( psa_get_key_lifetime( key_slot, &lifetime_get ));
+    TEST_ASSERT( psa_get_key_lifetime( key_slot, 
+								 &lifetime_get ) == PSA_SUCCESS );
 
     TEST_ASSERT( lifetime_get == lifetime_set ); 
 
 exit:
-    mbedtls_free( key );
     psa_destroy_key( key_slot );
     mbedtls_psa_crypto_free( );
 }
@@ -403,8 +402,6 @@
     psa_status_t actual_status;
     psa_status_t expected_status = expected_status_arg;
 
-    TEST_ASSERT( key != NULL );
-
     memset( key, 0x2a, sizeof( key ) );
  
     TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
@@ -420,7 +417,6 @@
     TEST_ASSERT( expected_status == actual_status );
 
 exit:
-    mbedtls_free( key );
     psa_destroy_key( key_slot );
     mbedtls_psa_crypto_free( );
 }