From 86e48c213c89df42040aa8e2e7d9a951b5e52a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 7 May 2019 10:17:56 +0200 Subject: [PATCH] Enforce promise to not use whole ssl context Configs with no DEBUG_C are use for example in test-ref-configs.pl, which also runs parts of compat.sh or ssl-opt.sh on them, so the added 'ssl = NULL' statements will be exercised in those tests at least. --- library/ssl_tls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index cb9267612..0f416b1fe 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -654,6 +654,7 @@ static int ssl_populate_transform( mbedtls_ssl_transform *transform, #if !defined(MBEDTLS_SSL_HW_RECORD_ACCEL) && \ !defined(MBEDTLS_SSL_EXPORT_KEYS) && \ !defined(MBEDTLS_DEBUG_C) + ssl = NULL; /* make sure we don't use it except for those cases */ (void) ssl; #endif @@ -1108,6 +1109,7 @@ static int ssl_compute_master( mbedtls_ssl_handshake_params *handshake, int ret; #if !defined(MBEDTLS_DEBUG_C) && !defined(MBEDTLS_SSL_EXTENDED_MASTER_SECRET) + ssl = NULL; /* make sure we don't use it except for debug and EMS */ (void) ssl; #endif @@ -1589,6 +1591,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl, /* The SSL context is only used for debugging purposes! */ #if !defined(MBEDTLS_DEBUG_C) + ssl = NULL; /* make sure we don't use it except for debug */ ((void) ssl); #endif @@ -1982,6 +1985,7 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context *ssl, unsigned char add_data[13]; #if !defined(MBEDTLS_DEBUG_C) + ssl = NULL; /* make sure we don't use it except for debug */ ((void) ssl); #endif