Merge remote-tracking branch 'upstream-public/pr/988' into development
diff --git a/ChangeLog b/ChangeLog
index b510b17..f59fed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,8 @@
* Fix out-of-memory problem when parsing 4096-bit PKCS8-encrypted RSA keys.
Found independently by Florian in the mbed TLS forum and by Mishamax.
#878, #1019.
+ * Fix variable used before assignment compilation warnings with IAR
+ toolchain. Found by gkerrien38.
= mbed TLS 2.6.0 branch released 2017-08-10
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 544c8cf..9227433 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -2261,7 +2261,7 @@
int ret;
const mbedtls_ssl_ciphersuite_t *ciphersuite_info =
ssl->transform_negotiate->ciphersuite_info;
- unsigned char *p, *end;
+ unsigned char *p = NULL, *end = NULL;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) );