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

Guard pk_opaque_rsa_decrypt() with PSA_WANT_KEY_TYPE_RSA_KEY_PAIR

Browse source 
Then mbedtls_pk_error_from_psa_rsa() also needs to be guarded with
PSA_WANT_KEY_TYPE_RSA_KEY_PAIR to be used by pk_opaque_rsa_decrypt()

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-05-03 15:42:13 +02:00
parent 6c26adc900
commit 30beca35f1
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/pk_wrap.c
View file

@ -100,7 +100,8 @@ int mbedtls_pk_error_from_psa( psa_status_t status )
} }
} }
#if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) #if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) || \
defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR)
int mbedtls_pk_error_from_psa_rsa( psa_status_t status ) int mbedtls_pk_error_from_psa_rsa( psa_status_t status )
{ {
switch( status ) switch( status )
@ -121,7 +122,7 @@ int mbedtls_pk_error_from_psa_rsa( psa_status_t status )
return( mbedtls_pk_error_from_psa( status ) ); return( mbedtls_pk_error_from_psa( status ) );
} }
} }
#endif #endif /* PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY || PSA_WANT_KEY_TYPE_RSA_KEY_PAIR */
#endif /* MBEDTLS_PSA_CRYPTO_C */ #endif /* MBEDTLS_PSA_CRYPTO_C */
@ -1602,6 +1603,7 @@ const mbedtls_pk_info_t mbedtls_pk_ecdsa_opaque_info = {
NULL, /* debug - could be done later, or even left NULL */ NULL, /* debug - could be done later, or even left NULL */
}; };
#if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR)
static int pk_opaque_rsa_decrypt( void *ctx, static int pk_opaque_rsa_decrypt( void *ctx,
const unsigned char *input, size_t ilen, const unsigned char *input, size_t ilen,
unsigned char *output, size_t *olen, size_t osize, unsigned char *output, size_t *olen, size_t osize,
@ -1625,6 +1627,7 @@ static int pk_opaque_rsa_decrypt( void *ctx,
return 0; return 0;
} }
#endif /* PSA_WANT_KEY_TYPE_RSA_KEY_PAIR */
const mbedtls_pk_info_t mbedtls_pk_rsa_opaque_info = { const mbedtls_pk_info_t mbedtls_pk_rsa_opaque_info = {
MBEDTLS_PK_OPAQUE, MBEDTLS_PK_OPAQUE,
@ -1637,7 +1640,11 @@ const mbedtls_pk_info_t mbedtls_pk_rsa_opaque_info = {
NULL, /* restartable verify - not relevant */ NULL, /* restartable verify - not relevant */
NULL, /* restartable sign - not relevant */ NULL, /* restartable sign - not relevant */
#endif #endif
#if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR)
pk_opaque_rsa_decrypt, pk_opaque_rsa_decrypt,
#else
NULL, /* decrypt - not available */
#endif /* PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY */
NULL, /* encrypt - will be done later */ NULL, /* encrypt - will be done later */
NULL, /* check_pair - could be done later or left NULL */ NULL, /* check_pair - could be done later or left NULL */
pk_opaque_alloc_wrap, pk_opaque_alloc_wrap,

5
library/pk_wrap.h
View file

@ -148,9 +148,10 @@ int mbedtls_pk_error_from_psa_ecdsa( psa_status_t status );
#if defined(MBEDTLS_PSA_CRYPTO_C) #if defined(MBEDTLS_PSA_CRYPTO_C)
int mbedtls_pk_error_from_psa( psa_status_t status ); int mbedtls_pk_error_from_psa( psa_status_t status );
#if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) #if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) || \
defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR)
int mbedtls_pk_error_from_psa_rsa( psa_status_t status ); int mbedtls_pk_error_from_psa_rsa( psa_status_t status );
#endif #endif /* PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY || PSA_WANT_KEY_TYPE_RSA_KEY_PAIR */
#if defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_RSA_C)
int mbedtls_pk_psa_rsa_sign_ext( psa_algorithm_t psa_alg_md, int mbedtls_pk_psa_rsa_sign_ext( psa_algorithm_t psa_alg_md,