From 2ba7d8ed2d644b6f1a64cde99c5fd4117368ffdf Mon Sep 17 00:00:00 2001
From: Dawid Drozd <dawid.drozd@mobica.com>
Date: Fri, 20 Jul 2018 14:08:02 +0200
Subject: [PATCH 1/2] Remove unnecessary mark as unused #1098 (backport)

---
 library/pkparse.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/pkparse.c b/library/pkparse.c
index 26a8b70ec..a83bb01c7 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1268,7 +1268,6 @@ int mbedtls_pk_parse_key( mbedtls_pk_context *pk,
         return( ret );
 #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
 #else
-    ((void) ret);
     ((void) pwd);
     ((void) pwdlen);
 #endif /* MBEDTLS_PEM_PARSE_C */

From c6a0fd8e83524bafec4fcff535415610c7c984ac Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Tue, 24 Jul 2018 10:03:41 +0100
Subject: [PATCH 2/2] Add ChangeLog entry for #1098 fix.

---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ea55e1fd..46547d6ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@ Bugfix
      by Brendan Shanks. Part of a fix for #992.
    * Fix compilation error when MBEDTLS_ARC4_C is disabled and
      MBEDTLS_CIPHER_NULL_CIPHER is enabled. Found by TrinityTonic in #1719.
+   * Fix compiler warning of 'use before initialisation' in
+     mbedtls_pk_parse_key(). Found by Martin Boye Petersen and fixed by Dawid
+     Drozd. #1098
 
 Changes
    * Change the shebang line in Perl scripts to look up perl in the PATH.