yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 18:05:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename unnamespaced identifiers

Browse Source 
Rename the enum constants TLS12_PRF_xxx, which are declared in a
public header but not intended for use in application code, to start
with MBEDTLS_PSA_.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2020-12-13 14:55:14 +01:00
parent f3c856536b
commit 43f958b24d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/psa/crypto_struct.h
View File

@ -228,11 +228,11 @@ typedef struct
#if defined(MBEDTLS_MD_C) #if defined(MBEDTLS_MD_C)
typedef enum typedef enum
{ {
TLS12_PRF_STATE_INIT, /* no input provided */ PSA_TLS12_PRF_STATE_INIT, /* no input provided */
TLS12_PRF_STATE_SEED_SET, /* seed has been set */ PSA_TLS12_PRF_STATE_SEED_SET, /* seed has been set */
TLS12_PRF_STATE_KEY_SET, /* key has been set */ PSA_TLS12_PRF_STATE_KEY_SET, /* key has been set */
TLS12_PRF_STATE_LABEL_SET, /* label has been set */ PSA_TLS12_PRF_STATE_LABEL_SET, /* label has been set */
TLS12_PRF_STATE_OUTPUT /* output has been started */ PSA_TLS12_PRF_STATE_OUTPUT /* output has been started */
} psa_tls12_prf_key_derivation_state_t; } psa_tls12_prf_key_derivation_state_t;
typedef struct psa_tls12_prf_key_derivation_s typedef struct psa_tls12_prf_key_derivation_s

12
library/psa_crypto.c
View File

@ -5839,7 +5839,7 @@ static psa_status_t psa_tls12_prf_set_seed( psa_tls12_prf_key_derivation_t *prf,
const uint8_t *data, const uint8_t *data,
size_t data_length ) size_t data_length )
{ {
if( prf->state != TLS12_PRF_STATE_INIT ) if( prf->state != PSA_TLS12_PRF_STATE_INIT )
return( PSA_ERROR_BAD_STATE ); return( PSA_ERROR_BAD_STATE );
if( data_length != 0 ) if( data_length != 0 )
@ -5852,7 +5852,7 @@ static psa_status_t psa_tls12_prf_set_seed( psa_tls12_prf_key_derivation_t *prf,
prf->seed_length = data_length; prf->seed_length = data_length;
} }
prf->state = TLS12_PRF_STATE_SEED_SET; prf->state = PSA_TLS12_PRF_STATE_SEED_SET;
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }
@ -5863,14 +5863,14 @@ static psa_status_t psa_tls12_prf_set_key( psa_tls12_prf_key_derivation_t *prf,
size_t data_length ) size_t data_length )
{ {
psa_status_t status; psa_status_t status;
if( prf->state != TLS12_PRF_STATE_SEED_SET ) if( prf->state != PSA_TLS12_PRF_STATE_SEED_SET )
return( PSA_ERROR_BAD_STATE ); return( PSA_ERROR_BAD_STATE );
status = psa_hmac_setup_internal( &prf->hmac, data, data_length, hash_alg ); status = psa_hmac_setup_internal( &prf->hmac, data, data_length, hash_alg );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
prf->state = TLS12_PRF_STATE_KEY_SET; prf->state = PSA_TLS12_PRF_STATE_KEY_SET;
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }
@ -5879,7 +5879,7 @@ static psa_status_t psa_tls12_prf_set_label( psa_tls12_prf_key_derivation_t *prf
const uint8_t *data, const uint8_t *data,
size_t data_length ) size_t data_length )
{ {
if( prf->state != TLS12_PRF_STATE_KEY_SET ) if( prf->state != PSA_TLS12_PRF_STATE_KEY_SET )
return( PSA_ERROR_BAD_STATE ); return( PSA_ERROR_BAD_STATE );
if( data_length != 0 ) if( data_length != 0 )
@ -5892,7 +5892,7 @@ static psa_status_t psa_tls12_prf_set_label( psa_tls12_prf_key_derivation_t *prf
prf->label_length = data_length; prf->label_length = data_length;
} }
prf->state = TLS12_PRF_STATE_LABEL_SET; prf->state = PSA_TLS12_PRF_STATE_LABEL_SET;
return( PSA_SUCCESS ); return( PSA_SUCCESS );
} }