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

Refactor get_sig_alg_from pk

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-03-22 21:42:50 +08:00
parent bf455e7516
commit e91a51a539
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
library/ssl_tls13_generic.c
View file

@ -982,15 +982,16 @@ cleanup:
/* /*
* STATE HANDLING: Output Certificate Verify * STATE HANDLING: Output Certificate Verify
*/ */
static uint16_t ssl_tls13_get_sig_alg_from_pk( mbedtls_ssl_context *ssl, static int ssl_tls13_get_sig_alg_from_pk( mbedtls_ssl_context *ssl,
mbedtls_pk_context *own_key, mbedtls_pk_context *own_key,
mbedtls_pk_type_t *pk_type, uint16_t *algorithm,
mbedtls_md_type_t *md_alg) mbedtls_pk_type_t *pk_type,
mbedtls_md_type_t *md_alg)
{ {
mbedtls_pk_type_t sig = mbedtls_ssl_sig_from_pk( own_key ); mbedtls_pk_type_t sig = mbedtls_ssl_sig_from_pk( own_key );
/* Determine the size of the key */ /* Determine the size of the key */
size_t own_key_size = mbedtls_pk_get_bitlen( own_key ); size_t own_key_size = mbedtls_pk_get_bitlen( own_key );
uint16_t algorithm = MBEDTLS_TLS1_3_SIG_NONE; *algorithm = MBEDTLS_TLS1_3_SIG_NONE;
((void) own_key_size); ((void) own_key_size);
switch( sig ) switch( sig )
@ -1000,20 +1001,20 @@ static uint16_t ssl_tls13_get_sig_alg_from_pk( mbedtls_ssl_context *ssl,
switch( own_key_size ) switch( own_key_size )
{ {
case 256: case 256:
algorithm = MBEDTLS_TLS1_3_SIG_ECDSA_SECP256R1_SHA256; *algorithm = MBEDTLS_TLS1_3_SIG_ECDSA_SECP256R1_SHA256;
*md_alg = MBEDTLS_MD_SHA256; *md_alg = MBEDTLS_MD_SHA256;
*pk_type = MBEDTLS_PK_ECDSA; *pk_type = MBEDTLS_PK_ECDSA;
break; return( 0 );
case 384: case 384:
algorithm = MBEDTLS_TLS1_3_SIG_ECDSA_SECP384R1_SHA384; *algorithm = MBEDTLS_TLS1_3_SIG_ECDSA_SECP384R1_SHA384;
*md_alg = MBEDTLS_MD_SHA384; *md_alg = MBEDTLS_MD_SHA384;
*pk_type = MBEDTLS_PK_ECDSA; *pk_type = MBEDTLS_PK_ECDSA;
break; return( 0 );
case 521: case 521:
algorithm = MBEDTLS_TLS1_3_SIG_ECDSA_SECP521R1_SHA512; *algorithm = MBEDTLS_TLS1_3_SIG_ECDSA_SECP521R1_SHA512;
*md_alg = MBEDTLS_MD_SHA512; *md_alg = MBEDTLS_MD_SHA512;
*pk_type = MBEDTLS_PK_ECDSA; *pk_type = MBEDTLS_PK_ECDSA;
break; return( 0 );
default: default:
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
( "unknown key size: %" ( "unknown key size: %"
@ -1030,25 +1031,28 @@ static uint16_t ssl_tls13_get_sig_alg_from_pk( mbedtls_ssl_context *ssl,
mbedtls_ssl_sig_alg_is_received( ssl, mbedtls_ssl_sig_alg_is_received( ssl,
MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256 ) ) MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256 ) )
{ {
algorithm = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256; *algorithm = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256;
*md_alg = MBEDTLS_MD_SHA256; *md_alg = MBEDTLS_MD_SHA256;
*pk_type = MBEDTLS_PK_RSASSA_PSS; *pk_type = MBEDTLS_PK_RSASSA_PSS;
return( 0 );
} }
else if( own_key_size <= 3072 && else if( own_key_size <= 3072 &&
mbedtls_ssl_sig_alg_is_received( ssl, mbedtls_ssl_sig_alg_is_received( ssl,
MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384 ) ) MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384 ) )
{ {
algorithm = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384; *algorithm = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384;
*md_alg = MBEDTLS_MD_SHA384; *md_alg = MBEDTLS_MD_SHA384;
*pk_type = MBEDTLS_PK_RSASSA_PSS; *pk_type = MBEDTLS_PK_RSASSA_PSS;
return( 0 );
} }
else if( own_key_size <= 4096 && else if( own_key_size <= 4096 &&
mbedtls_ssl_sig_alg_is_received( ssl, mbedtls_ssl_sig_alg_is_received( ssl,
MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512 ) ) MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512 ) )
{ {
algorithm = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512; *algorithm = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512;
*md_alg = MBEDTLS_MD_SHA512; *md_alg = MBEDTLS_MD_SHA512;
*pk_type = MBEDTLS_PK_RSASSA_PSS; *pk_type = MBEDTLS_PK_RSASSA_PSS;
return( 0 );
} }
break; break;
#endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */ #endif /* MBEDTLS_X509_RSASSA_PSS_SUPPORT */
@ -1057,7 +1061,7 @@ static uint16_t ssl_tls13_get_sig_alg_from_pk( mbedtls_ssl_context *ssl,
( "unkown signature type : %u", sig ) ); ( "unkown signature type : %u", sig ) );
break; break;
} }
return( algorithm ); return( -1 );
} }
static int ssl_tls13_write_certificate_verify_body( mbedtls_ssl_context *ssl, static int ssl_tls13_write_certificate_verify_body( mbedtls_ssl_context *ssl,
@ -1112,10 +1116,9 @@ static int ssl_tls13_write_certificate_verify_body( mbedtls_ssl_context *ssl,
* opaque signature<0..2^16-1>; * opaque signature<0..2^16-1>;
* } CertificateVerify; * } CertificateVerify;
*/ */
algorithm = ssl_tls13_get_sig_alg_from_pk( ssl, own_key, ret = ssl_tls13_get_sig_alg_from_pk( ssl, own_key, &algorithm,
&pk_type, &md_alg ); &pk_type, &md_alg );
if( algorithm == MBEDTLS_TLS1_3_SIG_NONE || if( ret != 0 || ! mbedtls_ssl_sig_alg_is_received( ssl, algorithm ) )
! mbedtls_ssl_sig_alg_is_received( ssl, algorithm ) )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, MBEDTLS_SSL_DEBUG_MSG( 1,
( "signature algorithm not in received or offered list." ) ); ( "signature algorithm not in received or offered list." ) );