eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Factor repeated condition to its own macro

Browse source 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2020-07-21 11:20:30 +02:00
parent 7a8b1e6b71
commit ed0e86428d
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/mbedtls/ssl_internal.h
View file

@ -154,6 +154,14 @@
#define MBEDTLS_SSL_SOME_SUITES_USE_CBC #define MBEDTLS_SSL_SOME_SUITES_USE_CBC
#endif #endif
#if defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC) && \
( defined(MBEDTLS_SSL_PROTO_TLS1) || \
defined(MBEDTLS_SSL_PROTO_TLS1_1) || \
defined(MBEDTLS_SSL_PROTO_TLS1_2) )
#define MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC
#endif
#if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER) || \ #if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER) || \
defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC) defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC)
#define MBEDTLS_SSL_SOME_MODES_USE_MAC #define MBEDTLS_SSL_SOME_MODES_USE_MAC

7
library/ssl_invasive.h
View file

@ -32,10 +32,7 @@
#include "mbedtls/md.h" #include "mbedtls/md.h"
#if defined(MBEDTLS_TEST_HOOKS) && \ #if defined(MBEDTLS_TEST_HOOKS) && \
defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC) && \ defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC)
( defined(MBEDTLS_SSL_PROTO_TLS1) || \
defined(MBEDTLS_SSL_PROTO_TLS1_1) | \
defined(MBEDTLS_SSL_PROTO_TLS1_2) )
/** \brief Compute the HMAC of variable-length data with constant flow. /** \brief Compute the HMAC of variable-length data with constant flow.
* *
* This function computes the HMAC of the concatenation of \p add_data and \p * This function computes the HMAC of the concatenation of \p add_data and \p
@ -74,6 +71,6 @@ int mbedtls_ssl_cf_hmac(
const unsigned char *data, size_t data_len_secret, const unsigned char *data, size_t data_len_secret,
size_t min_data_len, size_t max_data_len, size_t min_data_len, size_t max_data_len,
unsigned char *output ); unsigned char *output );
#endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_SSL_SOME_SUITES_USE_CBC && TLS 1.0-1.2 */ #endif /* MBEDTLS_TEST_HOOKS && MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */
#endif /* MBEDTLS_SSL_INVASIVE_H */ #endif /* MBEDTLS_SSL_INVASIVE_H */

7
library/ssl_msg.c
View file

@ -1066,10 +1066,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
return( 0 ); return( 0 );
} }
#if defined(MBEDTLS_SSL_SOME_SUITES_USE_CBC) && \ #if defined(MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC)
( defined(MBEDTLS_SSL_PROTO_TLS1) || \
defined(MBEDTLS_SSL_PROTO_TLS1_1) || \
defined(MBEDTLS_SSL_PROTO_TLS1_2) )
/* /*
* Constant-flow conditional memcpy: * Constant-flow conditional memcpy:
* - if c1 == c2, equivalent to memcpy(dst, src, len), * - if c1 == c2, equivalent to memcpy(dst, src, len),
@ -1182,7 +1179,7 @@ MBEDTLS_STATIC_TESTABLE int mbedtls_ssl_cf_hmac(
mbedtls_md_free( &aux ); mbedtls_md_free( &aux );
return( 0 ); return( 0 );
} }
#endif /* MBEDTLS_SSL_SOME_SUITES_USE_CBC && TLS 1.0-1.2 */ #endif /* MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC */
int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl, int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context const *ssl,
mbedtls_ssl_transform *transform, mbedtls_ssl_transform *transform,

6
tests/suites/test_suite_ssl.function
View file

@ -4055,16 +4055,12 @@ void resize_buffers_renegotiate_mfl( int mfl, int legacy_renegotiation,
} }
/* END_CASE */ /* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_CIPHER_MODE_CBC:MBEDTLS_AES_C:MBEDTLS_SSL_PROTO_TLS1_2:MBEDTLS_TEST_HOOKS */ /* BEGIN_CASE depends_on:MBEDTLS_SSL_SOME_SUITES_USE_TLS_CBC:MBEDTLS_TEST_HOOKS */
void ssl_cf_hmac( int hash ) void ssl_cf_hmac( int hash )
{ {
/* /*
* Test the function mbedtls_ssl_cf_hmac() against a reference * Test the function mbedtls_ssl_cf_hmac() against a reference
* implementation. * implementation.
*
* Note: the dependency is actually on TLS 1.0-1.2 and (AES or ARIA or
* Camellia or DES), but since the test framework doesn't support
* alternation in dependencies, just depend on the most common.
*/ */
mbedtls_md_context_t ctx, ref_ctx; mbedtls_md_context_t ctx, ref_ctx;
const mbedtls_md_info_t *md_info; const mbedtls_md_info_t *md_info;