yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 23:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

TinyCrypt PK parse: Move TC-based EC public key parsing code-block

Browse source 
Keep code-paths handling legacy-ECC vs. TinyCrypt together
for better readability.
This commit is contained in:
Hanno Becker 2019-08-21 11:51:53 +01:00
parent 3bef643987
commit 8cf2f5e466
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/pkparse.c
View file

@ -718,18 +718,18 @@ int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 ) if( ( ret = mbedtls_pk_setup( pk, pk_info ) ) != 0 )
return( ret ); return( ret );
#if defined(MBEDTLS_USE_TINYCRYPT)
if( pk_alg == MBEDTLS_PK_ECKEY )
{
ret = pk_get_ueccpubkey( p, end, (uint8_t*) pk->pk_ctx );
} else
#endif /* MBEDTLS_USE_TINYCRYPT */
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
if( pk_alg == MBEDTLS_PK_RSA ) if( pk_alg == MBEDTLS_PK_RSA )
{ {
ret = pk_get_rsapubkey( p, end, mbedtls_pk_rsa( *pk ) ); ret = pk_get_rsapubkey( p, end, mbedtls_pk_rsa( *pk ) );
} else } else
#endif /* MBEDTLS_RSA_C */ #endif /* MBEDTLS_RSA_C */
#if defined(MBEDTLS_USE_TINYCRYPT)
if( pk_alg == MBEDTLS_PK_ECKEY )
{
ret = pk_get_ueccpubkey( p, end, (uint8_t*) pk->pk_ctx );
} else
#else /* MBEDTLS_USE_TINYCRYPT */
#if defined(MBEDTLS_ECP_C) #if defined(MBEDTLS_ECP_C)
if( pk_alg == MBEDTLS_PK_ECKEY_DH || pk_alg == MBEDTLS_PK_ECKEY ) if( pk_alg == MBEDTLS_PK_ECKEY_DH || pk_alg == MBEDTLS_PK_ECKEY )
{ {
@ -738,6 +738,7 @@ int mbedtls_pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
ret = pk_get_ecpubkey( p, end, mbedtls_pk_ec( *pk ) ); ret = pk_get_ecpubkey( p, end, mbedtls_pk_ec( *pk ) );
} else } else
#endif /* MBEDTLS_ECP_C */ #endif /* MBEDTLS_ECP_C */
#endif /* MBEDTLS_USE_TINYCRYPT */
ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG; ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
if( ret == 0 && *p != end ) if( ret == 0 && *p != end )