From 4d01c5b5c3770ad8c76b30ec415f857c6d454e9a Mon Sep 17 00:00:00 2001
From: Chris Jones <christopher.jones@arm.com>
Date: Wed, 28 Apr 2021 14:12:07 +0100
Subject: [PATCH] Remove dead code from pk_parse_key_pkcs8_unencrypted_der

pk_get_pk_alg will either return 0 or a pk error code. This means that
the error code will always be a high level module ID and so we just
return ret.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
---
 library/pkparse.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/library/pkparse.c b/library/pkparse.c
index 31339c1cc4..3222ca20fb 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1041,14 +1041,7 @@ static int pk_parse_key_pkcs8_unencrypted_der(
 
     if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &params ) ) != 0 )
     {
-        if( ret >= -0x007F )
-        {
-            return( MBEDTLS_ERROR_ADD( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT, ret ) );
-        }
-        else
-        {
-            return ret;
-        }
+        return( ret );
     }
 
     if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )