commit 531aede488b6bec20fc18f5ae0310ac0bdf0495c
author Chris Jones <christopher.jones@arm.com> Wed Apr 14 18:15:24 2021 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Wed Apr 28 13:54:16 2021 +0200
tree 618db3a5aed8dd94779c8fb66ad1f46ed36d1bc1
parent 21dab7aee6008f2c513c0c2016b317aa28580da9

Fix an incorrect error code addition in pk_parse_key_pkcs8_unencrypted_der

An incorrect error code addition was spotted by the new invasive testing
infrastructure whereby pk_get_pk_alg will always return a high level
error or zero and pk_parse_key_pkcs8_unencrypted_der will try to add
another high level error, resulting in a garbage error code.

Signed-off-by: Chris Jones <christopher.jones@arm.com>
Signed-off-by: Gilles Peskine <gilles.peskine@arm.com>

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index e410f3a..2622351 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -1070,7 +1070,7 @@
         return( MBEDTLS_ERR_PK_KEY_INVALID_VERSION + ret );
 
     if( ( ret = pk_get_pk_alg( &p, end, &pk_alg, &params ) ) != 0 )
-        return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );
+        return( ret );
 
     if( ( ret = mbedtls_asn1_get_tag( &p, end, &len, MBEDTLS_ASN1_OCTET_STRING ) ) != 0 )
         return( MBEDTLS_ERR_PK_KEY_INVALID_FORMAT + ret );