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

PK: change the check_pair interface to take full private context

Browse Source
This commit is contained in:
Unknown 2018-02-08 07:45:41 -05:00
parent 8fb94311e9
commit 4d092dc42c
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mbedtls/pk_info.h
View File

@ -202,7 +202,7 @@ struct mbedtls_pk_info_t
* is guaranteed to be initialized. * is guaranteed to be initialized.
* *
* Opaque implementations may omit this method. */ * Opaque implementations may omit this method. */
int (*check_pair_func)( const mbedtls_pk_context *pub, const void *prv ); int (*check_pair_func)( const mbedtls_pk_context *pub, const mbedtls_pk_context *prv );
/** Allocate a new context /** Allocate a new context
* *

14
library/pk.c
View File

@ -329,14 +329,14 @@ int mbedtls_pk_check_pair( const mbedtls_pk_context *pub, const mbedtls_pk_conte
return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE ); return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
} }
if( prv->pk_info->type != MBEDTLS_PK_RSA_ALT && if( prv->pk_info->type != MBEDTLS_PK_OPAQUE &&
prv->pk_info->type != MBEDTLS_PK_OPAQUE ) prv->pk_info->type != MBEDTLS_PK_RSA_ALT )
{ {
if( pub->pk_info != prv->pk_info ) if( pub->pk_info != prv->pk_info )
return( MBEDTLS_ERR_PK_TYPE_MISMATCH ); return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
} }
return( prv->pk_info->check_pair_func( pub, prv->pk_ctx ) ); return( prv->pk_info->check_pair_func( pub, prv ) );
} }
/* /*

21
library/pk_wrap.c
View File

@ -154,9 +154,10 @@ static int rsa_encrypt_wrap( void *ctx,
ilen, input, output ) ); ilen, input, output ) );
} }
static int rsa_check_pair_wrap( const mbedtls_pk_context *pub, const void *prv ) static int rsa_check_pair_wrap( const mbedtls_pk_context *pub,
const mbedtls_pk_context *prv )
{ {
return( mbedtls_rsa_check_pub_priv( pub->pk_ctx, prv ) ); return( mbedtls_rsa_check_pub_priv( pub->pk_ctx, prv->pk_ctx ) );
} }
static void *rsa_alloc_wrap( void ) static void *rsa_alloc_wrap( void )
@ -277,9 +278,10 @@ static size_t ecdsa_signature_size( const void *ctx_arg )
#endif /* MBEDTLS_ECDSA_C */ #endif /* MBEDTLS_ECDSA_C */
static int eckey_check_pair( const mbedtls_pk_context *pub, const void *prv ) static int eckey_check_pair( const mbedtls_pk_context *pub,
const mbedtls_pk_context *prv )
{ {
return( mbedtls_ecp_check_pub_priv( pub->pk_ctx, prv ) ); return( mbedtls_ecp_check_pub_priv( pub->pk_ctx, prv->pk_ctx ) );
} }
static void *eckey_alloc_wrap( void ) static void *eckey_alloc_wrap( void )
@ -480,26 +482,25 @@ static int rsa_alt_decrypt_wrap( void *ctx,
} }
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
static int rsa_alt_check_pair( const mbedtls_pk_context *pub, const void *prv ) static int rsa_alt_check_pair( const mbedtls_pk_context *pub,
const mbedtls_pk_context *prv )
{ {
unsigned char sig[MBEDTLS_MPI_MAX_SIZE]; unsigned char sig[MBEDTLS_MPI_MAX_SIZE];
unsigned char hash[32]; unsigned char hash[32];
size_t sig_len = 0; size_t sig_len = 0;
int ret; int ret;
const mbedtls_pk_context* prv_context = prv; if( prv->pk_info->type == MBEDTLS_PK_RSA_ALT )
if( prv_context->pk_info->type == MBEDTLS_PK_RSA_ALT )
{ {
if( pub->pk_info->type != MBEDTLS_PK_RSA ) if( pub->pk_info->type != MBEDTLS_PK_RSA )
return( MBEDTLS_ERR_PK_TYPE_MISMATCH ); return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
} }
if( rsa_alt_get_bitlen( prv ) != rsa_get_bitlen( pub->pk_ctx ) ) if( rsa_alt_get_bitlen( prv->pk_ctx ) != rsa_get_bitlen( pub->pk_ctx ) )
return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED ); return( MBEDTLS_ERR_RSA_KEY_CHECK_FAILED );
memset( hash, 0x2a, sizeof( hash ) ); memset( hash, 0x2a, sizeof( hash ) );
if( ( ret = rsa_alt_sign_wrap( (void *) prv, MBEDTLS_MD_NONE, if( ( ret = rsa_alt_sign_wrap( (void *) prv->pk_ctx, MBEDTLS_MD_NONE,
hash, sizeof( hash ), hash, sizeof( hash ),
sig, &sig_len, NULL, NULL ) ) != 0 ) sig, &sig_len, NULL, NULL ) ) != 0 )
{ {

4
tests/suites/test_suite_pk.function
View File

@ -273,9 +273,9 @@ exit:
} }
static int opaque_mock_check_pair_func( const mbedtls_pk_context *pub, static int opaque_mock_check_pair_func( const mbedtls_pk_context *pub,
const void *prv ) const mbedtls_pk_context *prv )
{ {
TEST_ASSERT( prv == &opaque_mock_fake_ctx ); TEST_ASSERT( prv->pk_ctx == &opaque_mock_fake_ctx );
if( mbedtls_pk_get_type( pub ) != MBEDTLS_PK_RSA ) if( mbedtls_pk_get_type( pub ) != MBEDTLS_PK_RSA )
return( MBEDTLS_ERR_PK_TYPE_MISMATCH ); return( MBEDTLS_ERR_PK_TYPE_MISMATCH );
return( 0 ); return( 0 );