commit c5487a889289ec977e860d1293fec61aae805260
author Gilles Peskine <Gilles.Peskine@arm.com> Mon Dec 03 18:08:14 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Tue Dec 11 16:48:13 2018 +0100
tree 6e8da1dc72c456f40a32744c1af8d04143c1467a
parent b77a6b25c02a8b5a94de7927d4d963dd5df11d97

Drop support for psa_key_slot_t in psa_crypto.c

This commit finishes the removal of support for direct access to key
slots in psa_crypto.c.

This marks the end of the necessary phase of the transition to key
handles. The code should subsequently be refactored to move key slot
management from psa_crypto.c to psa_crypto_slot_management.c.

tests/suites/test_suite_psa_crypto.data

diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data
index 9801a8d..848e8ed 100644
--- a/tests/suites/test_suite_psa_crypto.data
+++ b/tests/suites/test_suite_psa_crypto.data
@@ -30,11 +30,10 @@
 import_key_nonempty_slot
 
 PSA export invalid handle (0)
-export_invalid_handle:0:PSA_ERROR_INVALID_ARGUMENT
+export_invalid_handle:0:PSA_ERROR_INVALID_HANDLE
 
 PSA export invalid handle (smallest plausible handle)
-# EMPTY_SLOT is temporary, because this valie is treated as a numbered slot, not as a handle
-export_invalid_handle:1:PSA_ERROR_EMPTY_SLOT
+export_invalid_handle:1:PSA_ERROR_INVALID_HANDLE
 
 PSA export invalid handle (largest plausible handle)
 export_invalid_handle:-1:PSA_ERROR_INVALID_HANDLE

tests/suites/test_suite_psa_crypto_slot_management.function

diff --git a/tests/suites/test_suite_psa_crypto_slot_management.function b/tests/suites/test_suite_psa_crypto_slot_management.function
index 1f1984e..753a705 100644
--- a/tests/suites/test_suite_psa_crypto_slot_management.function
+++ b/tests/suites/test_suite_psa_crypto_slot_management.function
@@ -321,10 +321,7 @@
     TEST_ASSERT( psa_close_key( 0 ) == PSA_ERROR_INVALID_HANDLE );
     TEST_ASSERT( psa_close_key( handle1 - 1 ) == PSA_ERROR_INVALID_HANDLE );
     TEST_ASSERT( psa_close_key( handle1 + 1 ) == PSA_ERROR_INVALID_HANDLE );
-    /* At the moment the implementation returns INVALID_ARGUMENT for 0
-     * because of the transitional support for non-allocated slot numbers.
-     * When this is removed, the error will switch to INVALID_HANDLE. */
-    TEST_ASSERT( psa_destroy_key( 0 ) == PSA_ERROR_INVALID_ARGUMENT );
+    TEST_ASSERT( psa_destroy_key( 0 ) == PSA_ERROR_INVALID_HANDLE );
     TEST_ASSERT( psa_destroy_key( handle1 - 1 ) == PSA_ERROR_INVALID_HANDLE );
     TEST_ASSERT( psa_destroy_key( handle1 + 1 ) == PSA_ERROR_INVALID_HANDLE );