commit 9be53ffd102d2585c99e4b3faffd658a4554cf63
author Gilles Peskine <gilles.peskine@arm.com> Wed Sep 01 16:53:50 2021 +0200
committer GitHub <noreply@github.com> Wed Sep 01 16:53:50 2021 +0200
tree 59e1b76541c35d8f5fdf6fbbc4f7b47dd75edbf2
parent b4c0668fa5ba844042f7c24c45404a1a3fa36758
parent c4e950ea530be43731ccced813303e9980343c22

Merge pull request #4903 from kennethsoerensen/pkparse-warning_2.x

Backport 2.x: Remove compiler warning if only MBEDTLS_PK_PARSE_C is d…

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 3222ca2..535ed70 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1380,8 +1380,11 @@
     }
 #endif /* MBEDTLS_PKCS12_C || MBEDTLS_PKCS5_C */
 
-    if( ( ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen ) ) == 0 )
+    ret = pk_parse_key_pkcs8_unencrypted_der( pk, key, keylen );
+    if( ret == 0 )
+    {
         return( 0 );
+    }
 
     mbedtls_pk_free( pk );
     mbedtls_pk_init( pk );