yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-30 17:31:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

GCM ciphersuites using only cipher layer

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-09-05 16:10:41 +02:00
parent b8bd593741
commit d13a4099dd
1 changed files with 90 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
library/ssl_tls.c
View file

@ -982,7 +982,7 @@ static int ssl_encrypt_buf( ssl_context *ssl )
if( ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_128_GCM || if( ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_128_GCM ||
ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM ) ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM )
{ {
size_t enc_msglen; size_t enc_msglen, olen, totlen;
unsigned char *enc_msg; unsigned char *enc_msg;
unsigned char add_data[13]; unsigned char add_data[13];
int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE; int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
@ -1032,19 +1032,55 @@ static int ssl_encrypt_buf( ssl_context *ssl )
ssl->out_msg, ssl->out_msglen ); ssl->out_msg, ssl->out_msglen );
/* /*
* Adjust for tag * Encrypt
*/
if( ( ret = cipher_set_iv( &ssl->transform_out->cipher_ctx_enc,
ssl->transform_out->iv_enc,
ssl->transform_out->ivlen ) ) != 0 ||
( ret = cipher_reset( &ssl->transform_out->cipher_ctx_enc ) ) != 0 )
{
return( ret );
}
if( ( ret = cipher_update_ad( &ssl->transform_out->cipher_ctx_enc,
add_data, 13 ) ) != 0 )
{
return( ret );
}
if( ( ret = cipher_update( &ssl->transform_out->cipher_ctx_enc,
enc_msg, enc_msglen,
enc_msg, &olen ) ) != 0 )
{
return( ret );
}
totlen = olen;
if( ( ret = cipher_finish( &ssl->transform_out->cipher_ctx_enc,
enc_msg + olen, &olen ) ) != 0 )
{
return( ret );
}
totlen += olen;
if( totlen != enc_msglen )
{
SSL_DEBUG_MSG( 1, ( "should never happen" ) );
return( -1 );
}
/*
* Authenticate
*/ */
ssl->out_msglen += 16; ssl->out_msglen += 16;
gcm_crypt_and_tag( ssl->transform_out->cipher_ctx_enc.cipher_ctx, if( ( ret = cipher_write_tag( &ssl->transform_out->cipher_ctx_enc,
GCM_ENCRYPT, enc_msglen, enc_msg + enc_msglen, 16 ) ) != 0 )
ssl->transform_out->iv_enc, ssl->transform_out->ivlen, {
add_data, 13, return( ret );
enc_msg, enc_msg, }
16, enc_msg + enc_msglen );
SSL_DEBUG_BUF( 4, "after encrypt: tag", SSL_DEBUG_BUF( 4, "after encrypt: tag", enc_msg + enc_msglen, 16 );
enc_msg + enc_msglen, 16 );
} }
else else
#endif /* POLARSSL_GCM_C */ #endif /* POLARSSL_GCM_C */
@ -1244,7 +1280,7 @@ static int ssl_decrypt_buf( ssl_context *ssl )
{ {
unsigned char *dec_msg; unsigned char *dec_msg;
unsigned char *dec_msg_result; unsigned char *dec_msg_result;
size_t dec_msglen; size_t dec_msglen, olen, totlen;
unsigned char add_data[13]; unsigned char add_data[13];
int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE; int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
@ -1275,19 +1311,51 @@ static int ssl_decrypt_buf( ssl_context *ssl )
ssl->transform_in->ivlen ); ssl->transform_in->ivlen );
SSL_DEBUG_BUF( 4, "TAG used", dec_msg + dec_msglen, 16 ); SSL_DEBUG_BUF( 4, "TAG used", dec_msg + dec_msglen, 16 );
ret = gcm_auth_decrypt( ssl->transform_in->cipher_ctx_dec.cipher_ctx, /*
dec_msglen, * Decrypt
ssl->transform_in->iv_dec, */
ssl->transform_in->ivlen, if( ( ret = cipher_set_iv( &ssl->transform_in->cipher_ctx_dec,
add_data, 13, ssl->transform_in->iv_dec,
dec_msg + dec_msglen, 16, ssl->transform_in->ivlen ) ) != 0 ||
dec_msg, dec_msg_result ); ( ret = cipher_reset( &ssl->transform_in->cipher_ctx_dec ) ) != 0 )
if( ret != 0 )
{ {
SSL_DEBUG_MSG( 1, ( "AEAD decrypt failed on validation (ret = -0x%02x)", return( ret );
-ret ) ); }
if( ( ret = cipher_update_ad( &ssl->transform_in->cipher_ctx_dec,
add_data, 13 ) ) != 0 )
{
return( ret );
}
if( ( ret = cipher_update( &ssl->transform_in->cipher_ctx_dec,
dec_msg, dec_msglen,
dec_msg_result, &olen ) ) != 0 )
{
return( ret );
}
totlen = olen;
if( ( ret = cipher_finish( &ssl->transform_in->cipher_ctx_dec,
dec_msg_result + olen, &olen ) ) != 0 )
{
return( ret );
}
totlen += olen;
if( totlen != dec_msglen )
{
SSL_DEBUG_MSG( 1, ( "should never happen" ) );
return( -1 );
}
/*
* Authenticate
*/
if( ( ret = cipher_check_tag( &ssl->transform_in->cipher_ctx_dec,
dec_msg + dec_msglen, 16 ) ) != 0 )
{
SSL_DEBUG_RET( 1, "cipher_check_tag", ret );
return( POLARSSL_ERR_SSL_INVALID_MAC ); return( POLARSSL_ERR_SSL_INVALID_MAC );
} }