mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-30 01:44:15 +01:00
Make calc_verify() return the length as well
Simplifies ssl_compute_hash(), but unfortunately not so much the other uses.
This commit is contained in:
parent
ed3b7a9492
commit
a575975280
@ -390,7 +390,7 @@ struct mbedtls_ssl_handshake_params
|
|||||||
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
|
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
|
||||||
|
|
||||||
void (*update_checksum)(mbedtls_ssl_context *, const unsigned char *, size_t);
|
void (*update_checksum)(mbedtls_ssl_context *, const unsigned char *, size_t);
|
||||||
void (*calc_verify)(const mbedtls_ssl_context *, unsigned char *);
|
void (*calc_verify)(const mbedtls_ssl_context *, unsigned char *, size_t *);
|
||||||
void (*calc_finished)(mbedtls_ssl_context *, unsigned char *, int);
|
void (*calc_finished)(mbedtls_ssl_context *, unsigned char *, int);
|
||||||
int (*tls_prf)(const unsigned char *, size_t, const char *,
|
int (*tls_prf)(const unsigned char *, size_t, const char *,
|
||||||
const unsigned char *, size_t,
|
const unsigned char *, size_t,
|
||||||
|
@ -3217,7 +3217,7 @@ static int ssl_write_certificate_verify( mbedtls_ssl_context *ssl )
|
|||||||
unsigned char hash[48];
|
unsigned char hash[48];
|
||||||
unsigned char *hash_start = hash;
|
unsigned char *hash_start = hash;
|
||||||
mbedtls_md_type_t md_alg = MBEDTLS_MD_NONE;
|
mbedtls_md_type_t md_alg = MBEDTLS_MD_NONE;
|
||||||
unsigned int hashlen;
|
size_t hashlen;
|
||||||
void *rs_ctx = NULL;
|
void *rs_ctx = NULL;
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write certificate verify" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write certificate verify" ) );
|
||||||
@ -3270,7 +3270,7 @@ static int ssl_write_certificate_verify( mbedtls_ssl_context *ssl )
|
|||||||
sign:
|
sign:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
ssl->handshake->calc_verify( ssl, hash );
|
ssl->handshake->calc_verify( ssl, hash, &hashlen );
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
|
#if defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
|
||||||
defined(MBEDTLS_SSL_PROTO_TLS1_1)
|
defined(MBEDTLS_SSL_PROTO_TLS1_1)
|
||||||
@ -3288,7 +3288,6 @@ sign:
|
|||||||
* sha_hash
|
* sha_hash
|
||||||
* SHA(handshake_messages);
|
* SHA(handshake_messages);
|
||||||
*/
|
*/
|
||||||
hashlen = 36;
|
|
||||||
md_alg = MBEDTLS_MD_NONE;
|
md_alg = MBEDTLS_MD_NONE;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -4163,7 +4163,10 @@ static int ssl_parse_certificate_verify( mbedtls_ssl_context *ssl )
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Calculate hash and verify signature */
|
/* Calculate hash and verify signature */
|
||||||
ssl->handshake->calc_verify( ssl, hash );
|
{
|
||||||
|
size_t dummy_hlen;
|
||||||
|
ssl->handshake->calc_verify( ssl, hash, &dummy_hlen );
|
||||||
|
}
|
||||||
|
|
||||||
if( ( ret = mbedtls_pk_verify( &ssl->session_negotiate->peer_cert->pk,
|
if( ( ret = mbedtls_pk_verify( &ssl->session_negotiate->peer_cert->pk,
|
||||||
md_alg, hash_start, hashlen,
|
md_alg, hash_start, hashlen,
|
||||||
|
@ -584,25 +584,25 @@ static void ssl_update_checksum_md5sha1( mbedtls_ssl_context *, const unsigned c
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_SSL3)
|
#if defined(MBEDTLS_SSL_PROTO_SSL3)
|
||||||
static void ssl_calc_verify_ssl( const mbedtls_ssl_context *, unsigned char * );
|
static void ssl_calc_verify_ssl( const mbedtls_ssl_context *, unsigned char *, size_t * );
|
||||||
static void ssl_calc_finished_ssl( mbedtls_ssl_context *, unsigned char *, int );
|
static void ssl_calc_finished_ssl( mbedtls_ssl_context *, unsigned char *, int );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1)
|
#if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1)
|
||||||
static void ssl_calc_verify_tls( const mbedtls_ssl_context *, unsigned char * );
|
static void ssl_calc_verify_tls( const mbedtls_ssl_context *, unsigned char *, size_t * );
|
||||||
static void ssl_calc_finished_tls( mbedtls_ssl_context *, unsigned char *, int );
|
static void ssl_calc_finished_tls( mbedtls_ssl_context *, unsigned char *, int );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
||||||
#if defined(MBEDTLS_SHA256_C)
|
#if defined(MBEDTLS_SHA256_C)
|
||||||
static void ssl_update_checksum_sha256( mbedtls_ssl_context *, const unsigned char *, size_t );
|
static void ssl_update_checksum_sha256( mbedtls_ssl_context *, const unsigned char *, size_t );
|
||||||
static void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *,unsigned char * );
|
static void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *,unsigned char *, size_t * );
|
||||||
static void ssl_calc_finished_tls_sha256( mbedtls_ssl_context *,unsigned char *, int );
|
static void ssl_calc_finished_tls_sha256( mbedtls_ssl_context *,unsigned char *, int );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(MBEDTLS_SHA512_C)
|
#if defined(MBEDTLS_SHA512_C)
|
||||||
static void ssl_update_checksum_sha384( mbedtls_ssl_context *, const unsigned char *, size_t );
|
static void ssl_update_checksum_sha384( mbedtls_ssl_context *, const unsigned char *, size_t );
|
||||||
static void ssl_calc_verify_tls_sha384( const mbedtls_ssl_context *, unsigned char * );
|
static void ssl_calc_verify_tls_sha384( const mbedtls_ssl_context *, unsigned char *, size_t * );
|
||||||
static void ssl_calc_finished_tls_sha384( mbedtls_ssl_context *, unsigned char *, int );
|
static void ssl_calc_finished_tls_sha384( mbedtls_ssl_context *, unsigned char *, int );
|
||||||
#endif
|
#endif
|
||||||
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
|
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
|
||||||
@ -1100,14 +1100,10 @@ static int ssl_set_handshake_prfs( mbedtls_ssl_handshake_params *handshake,
|
|||||||
* [in/out] handshake
|
* [in/out] handshake
|
||||||
* [in] resume, premaster, extended_ms, calc_verify, tls_prf
|
* [in] resume, premaster, extended_ms, calc_verify, tls_prf
|
||||||
* [out] premaster (cleared)
|
* [out] premaster (cleared)
|
||||||
* [in] minor_ver (to compute hash_len)
|
|
||||||
* [in] hash_alg (to compute hash_len)
|
|
||||||
* [out] master
|
* [out] master
|
||||||
* [in] ssl: optionally used for debugging and calc_verify
|
* [in] ssl: optionally used for debugging and calc_verify
|
||||||
*/
|
*/
|
||||||
static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
|
static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
|
||||||
int minor_ver,
|
|
||||||
mbedtls_md_type_t hash_alg,
|
|
||||||
unsigned char *master,
|
unsigned char *master,
|
||||||
const mbedtls_ssl_context *ssl )
|
const mbedtls_ssl_context *ssl )
|
||||||
{
|
{
|
||||||
@ -1115,12 +1111,6 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
|
|||||||
|
|
||||||
#if !defined(MBEDTLS_DEBUG_C) && !defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
|
#if !defined(MBEDTLS_DEBUG_C) && !defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET)
|
||||||
(void) ssl;
|
(void) ssl;
|
||||||
#endif
|
|
||||||
#if !defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET) || !defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
|
||||||
(void) minor_ver;
|
|
||||||
#if defined(MBEDTLS_SHA512_C)
|
|
||||||
(void) hash_alg;
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if( handshake->resume != 0 )
|
if( handshake->resume != 0 )
|
||||||
@ -1140,23 +1130,7 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake,
|
|||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "using extended master secret" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 3, ( "using extended master secret" ) );
|
||||||
|
|
||||||
handshake->calc_verify( ssl, session_hash );
|
handshake->calc_verify( ssl, session_hash, &hash_len );
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
|
||||||
if( minor_ver == MBEDTLS_SSL_MINOR_VERSION_3 )
|
|
||||||
{
|
|
||||||
#if defined(MBEDTLS_SHA512_C)
|
|
||||||
if( hash_alg == MBEDTLS_MD_SHA384 )
|
|
||||||
{
|
|
||||||
hash_len = 48;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
hash_len = 32;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
|
|
||||||
hash_len = 36;
|
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_BUF( 3, "session hash", session_hash, hash_len );
|
MBEDTLS_SSL_DEBUG_BUF( 3, "session hash", session_hash, hash_len );
|
||||||
|
|
||||||
@ -1205,8 +1179,6 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
|
|||||||
}
|
}
|
||||||
|
|
||||||
ret = ssl_compute_master( ssl->handshake,
|
ret = ssl_compute_master( ssl->handshake,
|
||||||
ssl->minor_ver,
|
|
||||||
ciphersuite_info->mac,
|
|
||||||
ssl->session_negotiate->master,
|
ssl->session_negotiate->master,
|
||||||
ssl );
|
ssl );
|
||||||
if( ret != 0 )
|
if( ret != 0 )
|
||||||
@ -1219,7 +1191,9 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_SSL3)
|
#if defined(MBEDTLS_SSL_PROTO_SSL3)
|
||||||
void ssl_calc_verify_ssl( const mbedtls_ssl_context *ssl, unsigned char hash[36] )
|
void ssl_calc_verify_ssl( const mbedtls_ssl_context *ssl,
|
||||||
|
unsigned char hash[36],
|
||||||
|
size_t *hlen )
|
||||||
{
|
{
|
||||||
mbedtls_md5_context md5;
|
mbedtls_md5_context md5;
|
||||||
mbedtls_sha1_context sha1;
|
mbedtls_sha1_context sha1;
|
||||||
@ -1257,7 +1231,9 @@ void ssl_calc_verify_ssl( const mbedtls_ssl_context *ssl, unsigned char hash[36]
|
|||||||
mbedtls_sha1_update_ret( &sha1, hash + 16, 20 );
|
mbedtls_sha1_update_ret( &sha1, hash + 16, 20 );
|
||||||
mbedtls_sha1_finish_ret( &sha1, hash + 16 );
|
mbedtls_sha1_finish_ret( &sha1, hash + 16 );
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, 36 );
|
*hlen = 36;
|
||||||
|
|
||||||
|
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, *hlen );
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
||||||
|
|
||||||
mbedtls_md5_free( &md5 );
|
mbedtls_md5_free( &md5 );
|
||||||
@ -1268,7 +1244,9 @@ void ssl_calc_verify_ssl( const mbedtls_ssl_context *ssl, unsigned char hash[36]
|
|||||||
#endif /* MBEDTLS_SSL_PROTO_SSL3 */
|
#endif /* MBEDTLS_SSL_PROTO_SSL3 */
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1)
|
#if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1)
|
||||||
void ssl_calc_verify_tls( const mbedtls_ssl_context *ssl, unsigned char hash[36] )
|
void ssl_calc_verify_tls( const mbedtls_ssl_context *ssl,
|
||||||
|
unsigned char hash[36],
|
||||||
|
size_t *hlen )
|
||||||
{
|
{
|
||||||
mbedtls_md5_context md5;
|
mbedtls_md5_context md5;
|
||||||
mbedtls_sha1_context sha1;
|
mbedtls_sha1_context sha1;
|
||||||
@ -1284,7 +1262,9 @@ void ssl_calc_verify_tls( const mbedtls_ssl_context *ssl, unsigned char hash[36]
|
|||||||
mbedtls_md5_finish_ret( &md5, hash );
|
mbedtls_md5_finish_ret( &md5, hash );
|
||||||
mbedtls_sha1_finish_ret( &sha1, hash + 16 );
|
mbedtls_sha1_finish_ret( &sha1, hash + 16 );
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, 36 );
|
*hlen = 36;
|
||||||
|
|
||||||
|
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, *hlen );
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
||||||
|
|
||||||
mbedtls_md5_free( &md5 );
|
mbedtls_md5_free( &md5 );
|
||||||
@ -1296,7 +1276,9 @@ void ssl_calc_verify_tls( const mbedtls_ssl_context *ssl, unsigned char hash[36]
|
|||||||
|
|
||||||
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
||||||
#if defined(MBEDTLS_SHA256_C)
|
#if defined(MBEDTLS_SHA256_C)
|
||||||
void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *ssl, unsigned char hash[32] )
|
void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *ssl,
|
||||||
|
unsigned char hash[32],
|
||||||
|
size_t *hlen )
|
||||||
{
|
{
|
||||||
mbedtls_sha256_context sha256;
|
mbedtls_sha256_context sha256;
|
||||||
|
|
||||||
@ -1307,7 +1289,9 @@ void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *ssl, unsigned char h
|
|||||||
mbedtls_sha256_clone( &sha256, &ssl->handshake->fin_sha256 );
|
mbedtls_sha256_clone( &sha256, &ssl->handshake->fin_sha256 );
|
||||||
mbedtls_sha256_finish_ret( &sha256, hash );
|
mbedtls_sha256_finish_ret( &sha256, hash );
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, 32 );
|
*hlen = 32;
|
||||||
|
|
||||||
|
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, *hlen );
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
||||||
|
|
||||||
mbedtls_sha256_free( &sha256 );
|
mbedtls_sha256_free( &sha256 );
|
||||||
@ -1317,7 +1301,9 @@ void ssl_calc_verify_tls_sha256( const mbedtls_ssl_context *ssl, unsigned char h
|
|||||||
#endif /* MBEDTLS_SHA256_C */
|
#endif /* MBEDTLS_SHA256_C */
|
||||||
|
|
||||||
#if defined(MBEDTLS_SHA512_C)
|
#if defined(MBEDTLS_SHA512_C)
|
||||||
void ssl_calc_verify_tls_sha384( const mbedtls_ssl_context *ssl, unsigned char hash[48] )
|
void ssl_calc_verify_tls_sha384( const mbedtls_ssl_context *ssl,
|
||||||
|
unsigned char hash[48],
|
||||||
|
size_t *hlen )
|
||||||
{
|
{
|
||||||
mbedtls_sha512_context sha512;
|
mbedtls_sha512_context sha512;
|
||||||
|
|
||||||
@ -1328,7 +1314,9 @@ void ssl_calc_verify_tls_sha384( const mbedtls_ssl_context *ssl, unsigned char h
|
|||||||
mbedtls_sha512_clone( &sha512, &ssl->handshake->fin_sha512 );
|
mbedtls_sha512_clone( &sha512, &ssl->handshake->fin_sha512 );
|
||||||
mbedtls_sha512_finish_ret( &sha512, hash );
|
mbedtls_sha512_finish_ret( &sha512, hash );
|
||||||
|
|
||||||
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, 48 );
|
*hlen = 48;
|
||||||
|
|
||||||
|
MBEDTLS_SSL_DEBUG_BUF( 3, "calculated verify result", hash, *hlen );
|
||||||
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= calc verify" ) );
|
||||||
|
|
||||||
mbedtls_sha512_free( &sha512 );
|
mbedtls_sha512_free( &sha512 );
|
||||||
|
Loading…
Reference in New Issue
Block a user