Merge pull request #46 from Patater/fix-windows-initializers
psa: Test fresh contexts have default behavior
diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 4a3044a..929d1b2 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -1441,15 +1441,15 @@
memset( &zero, 0, sizeof( zero ) );
- /* Although not technically guaranteed by the C standard nor the PSA Crypto
- * specification, we test that all valid ways of initializing the object
- * have the same bit pattern. This is a stronger requirement that may not
- * be valid on all platforms or PSA Crypto implementations, but implies the
- * weaker actual requirement is met: that a freshly initialized object, no
- * matter how it was initialized, acts the same as any other valid
- * initialization. */
- TEST_EQUAL( memcmp( &func, &zero, sizeof( zero ) ), 0 );
- TEST_EQUAL( memcmp( &init, &zero, sizeof( zero ) ), 0 );
+ /* A default key policy should not permit any usage. */
+ TEST_EQUAL( psa_key_policy_get_usage( &func ), 0 );
+ TEST_EQUAL( psa_key_policy_get_usage( &init ), 0 );
+ TEST_EQUAL( psa_key_policy_get_usage( &zero ), 0 );
+
+ /* A default key policy should not permit any algorithm. */
+ TEST_EQUAL( psa_key_policy_get_algorithm( &func ), 0 );
+ TEST_EQUAL( psa_key_policy_get_algorithm( &init ), 0 );
+ TEST_EQUAL( psa_key_policy_get_algorithm( &zero ), 0 );
}
/* END_CASE */
@@ -1960,15 +1960,10 @@
memset( &zero, 0, sizeof( zero ) );
- /* Although not technically guaranteed by the C standard nor the PSA Crypto
- * specification, we test that all valid ways of initializing the object
- * have the same bit pattern. This is a stronger requirement that may not
- * be valid on all platforms or PSA Crypto implementations, but implies the
- * weaker actual requirement is met: that a freshly initialized object, no
- * matter how it was initialized, acts the same as any other valid
- * initialization. */
- TEST_EQUAL( memcmp( &func, &zero, sizeof( zero ) ), 0 );
- TEST_EQUAL( memcmp( &init, &zero, sizeof( zero ) ), 0 );
+ /* A default hash operation should be abortable without error. */
+ PSA_ASSERT( psa_hash_abort( &func ) );
+ PSA_ASSERT( psa_hash_abort( &init ) );
+ PSA_ASSERT( psa_hash_abort( &zero ) );
}
/* END_CASE */
@@ -2183,15 +2178,10 @@
memset( &zero, 0, sizeof( zero ) );
- /* Although not technically guaranteed by the C standard nor the PSA Crypto
- * specification, we test that all valid ways of initializing the object
- * have the same bit pattern. This is a stronger requirement that may not
- * be valid on all platforms or PSA Crypto implementations, but implies the
- * weaker actual requirement is met: that a freshly initialized object, no
- * matter how it was initialized, acts the same as any other valid
- * initialization. */
- TEST_EQUAL( memcmp( &func, &zero, sizeof( zero ) ), 0 );
- TEST_EQUAL( memcmp( &init, &zero, sizeof( zero ) ), 0 );
+ /* A default MAC operation should be abortable without error. */
+ PSA_ASSERT( psa_mac_abort( &func ) );
+ PSA_ASSERT( psa_mac_abort( &init ) );
+ PSA_ASSERT( psa_mac_abort( &zero ) );
}
/* END_CASE */
@@ -2338,15 +2328,10 @@
memset( &zero, 0, sizeof( zero ) );
- /* Although not technically guaranteed by the C standard nor the PSA Crypto
- * specification, we test that all valid ways of initializing the object
- * have the same bit pattern. This is a stronger requirement that may not
- * be valid on all platforms or PSA Crypto implementations, but implies the
- * weaker actual requirement is met: that a freshly initialized object, no
- * matter how it was initialized, acts the same as any other valid
- * initialization. */
- TEST_EQUAL( memcmp( &func, &zero, sizeof( zero ) ), 0 );
- TEST_EQUAL( memcmp( &init, &zero, sizeof( zero ) ), 0 );
+ /* A default cipher operation should be abortable without error. */
+ PSA_ASSERT( psa_cipher_abort( &func ) );
+ PSA_ASSERT( psa_cipher_abort( &init ) );
+ PSA_ASSERT( psa_cipher_abort( &zero ) );
}
/* END_CASE */
@@ -3527,21 +3512,25 @@
* Clang 5 complains when `-Wmissing-field-initializers` is used, even
* though it's OK by the C standard. We could test for this, but we'd need
* to supress the Clang warning for the test. */
+ size_t capacity;
psa_crypto_generator_t func = psa_crypto_generator_init( );
psa_crypto_generator_t init = PSA_CRYPTO_GENERATOR_INIT;
psa_crypto_generator_t zero;
memset( &zero, 0, sizeof( zero ) );
- /* Although not technically guaranteed by the C standard nor the PSA Crypto
- * specification, we test that all valid ways of initializing the object
- * have the same bit pattern. This is a stronger requirement that may not
- * be valid on all platforms or PSA Crypto implementations, but implies the
- * weaker actual requirement is met: that a freshly initialized object, no
- * matter how it was initialized, acts the same as any other valid
- * initialization. */
- TEST_EQUAL( memcmp( &func, &zero, sizeof( zero ) ), 0 );
- TEST_EQUAL( memcmp( &init, &zero, sizeof( zero ) ), 0 );
+ /* A default generator should have no capacity. */
+ PSA_ASSERT( psa_get_generator_capacity( &func, &capacity ) );
+ TEST_EQUAL( capacity, 0 );
+ PSA_ASSERT( psa_get_generator_capacity( &init, &capacity ) );
+ TEST_EQUAL( capacity, 0 );
+ PSA_ASSERT( psa_get_generator_capacity( &zero, &capacity ) );
+ TEST_EQUAL( capacity, 0 );
+
+ /* A default generator should be abortable without error. */
+ PSA_ASSERT( psa_generator_abort(&func) );
+ PSA_ASSERT( psa_generator_abort(&init) );
+ PSA_ASSERT( psa_generator_abort(&zero) );
}
/* END_CASE */