yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Key Policy APIs implementation

Browse source
This commit is contained in:
mohammad1603 2018-03-28 01:21:33 +03:00 committed by itayzafrir
parent 0eb6e97ac6
commit 8cc1ceec3e
4 changed files with 127 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/psa/crypto.h
View file

@ -89,6 +89,8 @@ typedef enum {
PSA_ERROR_INVALID_SIGNATURE,
/** The decrypted padding is incorrect. */
PSA_ERROR_INVALID_PADDING,
/** The key policy is incorrect. */
PSA_ERROR_INVALID_KEY_POLICY,
/** An error occurred that does not correspond to any defined
failure cause. */
PSA_ERROR_UNKNOWN_ERROR,
@ -489,6 +491,10 @@ psa_status_t psa_export_public_key(psa_key_slot_t key,
/** \brief Encoding of permitted usage on a key. */
typedef uint32_t psa_key_usage_t;
/** An invalid key usage value.
* */
#define PSA_KEY_USAGE_NONE ((psa_key_usage_t)0x00000000)
/** Whether the key may be exported.
*
* A public key or the public part of a key pair may always be exported

79
library/psa_crypto.c
View file

@ -96,6 +96,7 @@ static inline int safer_memcmp( const uint8_t *a, const uint8_t *b, size_t n )
typedef struct {
psa_key_type_t type;
psa_key_policy_t policy;
union {
struct raw_data {
uint8_t *data;
@ -1260,6 +1261,84 @@ psa_status_t psa_asymmetric_sign(psa_key_slot_t key,
}
/****************************************************************/
/* Key Policy */
/****************************************************************/
void psa_key_policy_init(psa_key_policy_t *policy)
{
mbedtls_zeroize( policy, sizeof( policy ) );
}
void psa_key_policy_set_usage(psa_key_policy_t *policy,
psa_key_usage_t usage,
psa_algorithm_t alg)
{
if( policy != NULL )
{
policy->usage = usage;
policy->alg = alg;
}
}
psa_key_usage_t psa_key_policy_get_usage(psa_key_policy_t *policy)
{
return policy->usage;
}
psa_algorithm_t psa_key_policy_get_algorithm(psa_key_policy_t *policy)
{
return policy->alg;
}
psa_status_t psa_set_key_policy(psa_key_slot_t key,
const psa_key_policy_t *policy)
{
key_slot_t *slot;
psa_key_usage_t usage = PSA_KEY_USAGE_NONE;
if( key == 0 || key > MBEDTLS_PSA_KEY_SLOT_COUNT || policy == NULL )
return( PSA_ERROR_INVALID_ARGUMENT );
slot = &global_data.key_slots[key];
if( slot->type != PSA_KEY_TYPE_NONE )
return( PSA_ERROR_OCCUPIED_SLOT );
usage |= policy->usage & PSA_KEY_USAGE_EXPORT;
usage |= policy->usage & PSA_KEY_USAGE_ENCRYPT;
usage |= policy->usage & PSA_KEY_USAGE_DECRYPT;
usage |= policy->usage & PSA_KEY_USAGE_SIGN;
usage |= policy->usage & PSA_KEY_USAGE_VERIFY;
if( usage == PSA_KEY_USAGE_NONE )
{
return( PSA_ERROR_INVALID_KEY_POLICY );
}
//TODO: is there any check over the algorithm before setting the policy?
slot->policy.usage = policy->usage;
slot->policy.alg = policy->alg;
return( PSA_SUCCESS );
}
psa_status_t psa_get_key_policy(psa_key_slot_t key,
psa_key_policy_t *policy)
{
key_slot_t *slot;
if( key == 0 || key > MBEDTLS_PSA_KEY_SLOT_COUNT || policy == NULL )
return( PSA_ERROR_INVALID_ARGUMENT );
slot = &global_data.key_slots[key];
if( slot->type == PSA_KEY_TYPE_NONE )
return( PSA_ERROR_EMPTY_SLOT );
policy->usage = slot->policy.usage;
policy->alg = slot->policy.alg;
return( PSA_SUCCESS );
}
/****************************************************************/
/* Module setup */

3
tests/suites/test_suite_psa_crypto.data
View file

@ -83,3 +83,6 @@ sign_fail:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5
PSA sign RSA PKCS#1 v1.5 SHA-256, output buffer too small
sign_fail:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_ALG_RSA_PKCS1V15(PSA_ALG_SHA_256):"ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad":127:PSA_ERROR_BUFFER_TOO_SMALL
PSA Key Policy set and get
key_policy:PSA_KEY_USAGE_ENCRYPT:PSA_ALG_CBC_BASE

39
tests/suites/test_suite_psa_crypto.function
View file

@ -360,3 +360,42 @@ exit:
mbedtls_psa_crypto_free( );
}
/* END_CASE */
/* BEGIN_CASE */
void key_policy( int usage_arg, int alg_arg )
{
int key_slot = 1;
psa_key_type_t key_type = PSA_ALG_CBC_BASE;
unsigned char key[32] = {0};
psa_key_policy_t policy_set = {0};
psa_key_policy_t policy_get = {0};
memset( key, 0x2a, sizeof( key ) );
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init(& policy_set );
psa_key_policy_init(& policy_get );
psa_key_policy_set_usage( &policy_set, usage_arg, alg_arg );
TEST_ASSERT( psa_key_policy_get_usage( &policy_set ) == ( psa_key_usage_t )usage_arg );
TEST_ASSERT( psa_key_policy_get_algorithm( &policy_set) == ( psa_algorithm_t )alg_arg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy_set ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type,
key, sizeof( key ) ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_policy( key_slot, &policy_get ) == PSA_SUCCESS );
TEST_ASSERT( policy_get.usage == policy_set.usage );
TEST_ASSERT( policy_get.alg == policy_set.alg );
exit:
psa_destroy_key( key_slot );
mbedtls_psa_crypto_free( );
}
/* END_CASE */