From 1abe8ee55482dd77a8c315fea1803c61113536a7 Mon Sep 17 00:00:00 2001 From: sander-visser Date: Wed, 6 May 2020 21:27:14 +0200 Subject: [PATCH 1/2] Expose SSL HW record acceleration error. Fix issue with variable shadowing. Signed-off-by: sander-visser --- library/ssl_tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index ccfc4bdaa..760ba90a5 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -1175,7 +1175,7 @@ static int ssl_populate_transform( mbedtls_ssl_transform *transform, #if defined(MBEDTLS_SSL_HW_RECORD_ACCEL) if( mbedtls_ssl_hw_record_init != NULL ) { - int ret = 0; + ret = 0; MBEDTLS_SSL_DEBUG_MSG( 2, ( "going for mbedtls_ssl_hw_record_init()" ) ); From a65fe0b8cbcf9be3be1ed46e1b8ca42717b8f5c7 Mon Sep 17 00:00:00 2001 From: sander-visser Date: Thu, 7 May 2020 20:37:31 +0200 Subject: [PATCH 2/2] Add changelog entry for #3310. Signed-off-by: sander-visser --- ChangeLog.d/fix-masked-hw-record-init-error.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ChangeLog.d/fix-masked-hw-record-init-error.txt diff --git a/ChangeLog.d/fix-masked-hw-record-init-error.txt b/ChangeLog.d/fix-masked-hw-record-init-error.txt new file mode 100644 index 000000000..2ef80daae --- /dev/null +++ b/ChangeLog.d/fix-masked-hw-record-init-error.txt @@ -0,0 +1,3 @@ +Bugfix + * Fix issue with a detected HW accelerated record error not being exposed + due to shadowed variable. Contributed by Sander Visser in #3310.