ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-24 22:29:04 +08:00
Code Issues Releases Wiki Activity

Rename signiture algorithm macros to better suite with TLS 1.2

Browse Source 
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei 2022-05-10 12:59:00 +02:00
parent 24c7c2be08
commit 3631cf693a
No known key found for this signature in database
GPG Key ID: 08AB7BB35012F877
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/ssl_misc.h
View File

@ -249,17 +249,17 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_2) #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
#define MBEDTLS_SSL_SIG_ALG( sig, hash ) (( hash << 8 ) | sig) #define MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( sig, hash ) (( hash << 8 ) | sig)
#define MBEDTLS_SSL_SIG_FROM_SIG_ALG(alg) (alg & 0xFF) #define MBEDTLS_SSL_TLS12_SIG_ALG_FROM_SIG_AND_HASH_ALG(alg) (alg & 0xFF)
#define MBEDTLS_SSL_HASH_FROM_SIG_ALG(alg) (alg >> 8) #define MBEDTLS_SSL_TLS12_HASH_ALG_FROM_SIG_AND_HASH_ALG(alg) (alg >> 8)
#if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_RSA_C) #if defined(MBEDTLS_ECDSA_C) && defined(MBEDTLS_RSA_C)
#define MBEDTLS_SSL_SIG_ALG_SET( hash ) MBEDTLS_SSL_SIG_ALG( MBEDTLS_SSL_SIG_ECDSA, hash ), \ #define MBEDTLS_SSL_SIG_ALG_SET( hash ) MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, hash ), \
MBEDTLS_SSL_SIG_ALG( MBEDTLS_SSL_SIG_RSA, hash ), MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, hash ),
#elif defined(MBEDTLS_ECDSA_C) #elif defined(MBEDTLS_ECDSA_C)
#define MBEDTLS_SSL_SIG_ALG_SET( hash ) MBEDTLS_SSL_SIG_ALG( MBEDTLS_SSL_SIG_ECDSA, hash ), #define MBEDTLS_SSL_SIG_ALG_SET( hash ) MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_ECDSA, hash ),
#elif defined(MBEDTLS_RSA_C) #elif defined(MBEDTLS_RSA_C)
#define MBEDTLS_SSL_SIG_ALG_SET( hash ) MBEDTLS_SSL_SIG_ALG( MBEDTLS_SSL_SIG_RSA, hash ), #define MBEDTLS_SSL_SIG_ALG_SET( hash ) MBEDTLS_SSL_TLS12_SIG_AND_HASH_ALG( MBEDTLS_SSL_SIG_RSA, hash ),
#else #else
#define MBEDTLS_SSL_SIG_ALG_SET( hash ) #define MBEDTLS_SSL_SIG_ALG_SET( hash )
#endif #endif

6
library/ssl_tls.c
View File

@ -7666,8 +7666,10 @@ unsigned int mbedtls_ssl_tls12_get_preferred_hash_for_sig_alg(
for( i = 0; received_sig_algs[i] != MBEDTLS_TLS_SIG_NONE; i++ ) for( i = 0; received_sig_algs[i] != MBEDTLS_TLS_SIG_NONE; i++ )
{ {
if( sig_alg == MBEDTLS_SSL_SIG_FROM_SIG_ALG( received_sig_algs[i] ) ) if( sig_alg == MBEDTLS_SSL_TLS12_SIG_ALG_FROM_SIG_AND_HASH_ALG(
return MBEDTLS_SSL_HASH_FROM_SIG_ALG( received_sig_algs[i] ); received_sig_algs[i] ) )
return MBEDTLS_SSL_TLS12_HASH_ALG_FROM_SIG_AND_HASH_ALG(
received_sig_algs[i] );
} }
return( MBEDTLS_SSL_HASH_NONE ); return( MBEDTLS_SSL_HASH_NONE );