mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-04 15:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify switching on mode in ssl_tls.c

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-10-25 18:33:32 +02:00
parent 98d9a2c061
commit 126a66f668
1 changed files with 57 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
library/ssl_tls.c
View File

@ -633,19 +633,8 @@ int ssl_derive_keys( ssl_context *ssl )
} }
#endif #endif
switch( cipher_info->type ) if( cipher_info->type != POLARSSL_CIPHER_NULL )
{ {
case POLARSSL_CIPHER_ARC4_128:
case POLARSSL_CIPHER_DES_CBC:
case POLARSSL_CIPHER_DES_EDE3_CBC:
case POLARSSL_CIPHER_CAMELLIA_128_CBC:
case POLARSSL_CIPHER_CAMELLIA_256_CBC:
case POLARSSL_CIPHER_CAMELLIA_128_GCM:
case POLARSSL_CIPHER_CAMELLIA_256_GCM:
case POLARSSL_CIPHER_AES_128_CBC:
case POLARSSL_CIPHER_AES_256_CBC:
case POLARSSL_CIPHER_AES_128_GCM:
case POLARSSL_CIPHER_AES_256_GCM:
if( ( ret = cipher_init_ctx( &transform->cipher_ctx_enc, if( ( ret = cipher_init_ctx( &transform->cipher_ctx_enc,
cipher_info ) ) != 0 ) cipher_info ) ) != 0 )
{ {
@ -694,13 +683,6 @@ int ssl_derive_keys( ssl_context *ssl )
} }
} }
#endif /* POLARSSL_CIPHER_MODE_CBC */ #endif /* POLARSSL_CIPHER_MODE_CBC */
break;
case POLARSSL_CIPHER_NULL:
break;
default:
return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
} }
memset( keyblk, 0, sizeof( keyblk ) ); memset( keyblk, 0, sizeof( keyblk ) );
@ -1037,7 +1019,8 @@ static int ssl_encrypt_buf( ssl_context *ssl )
else else
#endif /* POLARSSL_CIPHER_NULL_CIPHER */ #endif /* POLARSSL_CIPHER_NULL_CIPHER */
#if defined(POLARSSL_ARC4_C) #if defined(POLARSSL_ARC4_C)
if( ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_ARC4_128 ) if( ssl->transform_out->cipher_ctx_enc.cipher_info->mode ==
POLARSSL_MODE_STREAM )
{ {
int ret; int ret;
size_t olen = 0; size_t olen = 0;
@ -1097,10 +1080,8 @@ static int ssl_encrypt_buf( ssl_context *ssl )
else else
#endif /* POLARSSL_ARC4_C */ #endif /* POLARSSL_ARC4_C */
#if defined(POLARSSL_GCM_C) #if defined(POLARSSL_GCM_C)
if( ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_128_GCM || if( ssl->transform_out->cipher_ctx_enc.cipher_info->mode ==
ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM || POLARSSL_MODE_GCM )
ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_128_GCM ||
ssl->transform_out->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_256_GCM )
{ {
size_t enc_msglen, olen, totlen; size_t enc_msglen, olen, totlen;
unsigned char *enc_msg; unsigned char *enc_msg;
@ -1203,7 +1184,8 @@ static int ssl_encrypt_buf( ssl_context *ssl )
} }
else else
#endif /* POLARSSL_GCM_C */ #endif /* POLARSSL_GCM_C */
#if defined(POLARSSL_CIPHER_MODE_CBC) #if defined(POLARSSL_CIPHER_MODE_CBC) && \
( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) )
if( ssl->transform_out->cipher_ctx_enc.cipher_info->mode == if( ssl->transform_out->cipher_ctx_enc.cipher_info->mode ==
POLARSSL_MODE_CBC ) POLARSSL_MODE_CBC )
{ {
@ -1310,7 +1292,8 @@ static int ssl_encrypt_buf( ssl_context *ssl )
#endif #endif
} }
else else
#endif /* POLARSSL_CIPHER_MODE_CBC */ #endif /* POLARSSL_CIPHER_MODE_CBC &&
( POLARSSL_AES_C || POLARSSL_CAMELLIA_C ) */
{ {
SSL_DEBUG_MSG( 1, ( "should never happen" ) ); SSL_DEBUG_MSG( 1, ( "should never happen" ) );
return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE ); return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
@ -1349,7 +1332,8 @@ static int ssl_decrypt_buf( ssl_context *ssl )
else else
#endif /* POLARSSL_CIPHER_NULL_CIPHER */ #endif /* POLARSSL_CIPHER_NULL_CIPHER */
#if defined(POLARSSL_ARC4_C) #if defined(POLARSSL_ARC4_C)
if( ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_ARC4_128 ) if( ssl->transform_in->cipher_ctx_dec.cipher_info->mode ==
POLARSSL_MODE_STREAM )
{ {
int ret; int ret;
size_t olen = 0; size_t olen = 0;
@ -1402,10 +1386,8 @@ static int ssl_decrypt_buf( ssl_context *ssl )
else else
#endif /* POLARSSL_ARC4_C */ #endif /* POLARSSL_ARC4_C */
#if defined(POLARSSL_GCM_C) #if defined(POLARSSL_GCM_C)
if( ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_128_GCM || if( ssl->transform_in->cipher_ctx_dec.cipher_info->mode ==
ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_AES_256_GCM || POLARSSL_MODE_GCM )
ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_128_GCM ||
ssl->transform_in->ciphersuite_info->cipher == POLARSSL_CIPHER_CAMELLIA_256_GCM )
{ {
unsigned char *dec_msg; unsigned char *dec_msg;
unsigned char *dec_msg_result; unsigned char *dec_msg_result;
@ -1491,7 +1473,8 @@ static int ssl_decrypt_buf( ssl_context *ssl )
} }
else else
#endif /* POLARSSL_GCM_C */ #endif /* POLARSSL_GCM_C */
#if defined(POLARSSL_CIPHER_MODE_CBC) #if defined(POLARSSL_CIPHER_MODE_CBC) && \
( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) )
if( ssl->transform_in->cipher_ctx_dec.cipher_info->mode == if( ssl->transform_in->cipher_ctx_dec.cipher_info->mode ==
POLARSSL_MODE_CBC ) POLARSSL_MODE_CBC )
{ {
@ -1657,7 +1640,8 @@ static int ssl_decrypt_buf( ssl_context *ssl )
} }
} }
else else
#endif /* POLARSSL_CIPHER_MODE_CBC */ #endif /* POLARSSL_CIPHER_MODE_CBC &&
( POLARSSL_AES_C || POLARSSL_CAMELLIA_C ) */
{ {
SSL_DEBUG_MSG( 1, ( "should never happen" ) ); SSL_DEBUG_MSG( 1, ( "should never happen" ) );
return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE ); return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );