commit 377f4eda2720e807db08bd55288522d362532f35
author Ronald Cron <ronald.cron@arm.com> Wed Apr 28 16:37:16 2021 +0200
committer GitHub <noreply@github.com> Wed Apr 28 16:37:16 2021 +0200
tree a6e21714b0f5879bdd18c61bea8d47db63a8278c
parent 87e7b9576740d788df77b87a2514b47da2c70f94
parent 531aede488b6bec20fc18f5ae0310ac0bdf0495c

Merge pull request #4436 from gilles-peskine-arm/error-add-2.16

Backport 2.16: Add macro to check error code additions/combinations

ChangeLog.d/fix-pk-parse-key-error-code.txt

diff --git a/ChangeLog.d/fix-pk-parse-key-error-code.txt b/ChangeLog.d/fix-pk-parse-key-error-code.txt
new file mode 100644
index 0000000..3aa330b
--- /dev/null
+++ b/ChangeLog.d/fix-pk-parse-key-error-code.txt
@@ -0,0 +1,2 @@
+Bugfix
+   * Fix an incorrect error code when parsing a PKCS#8 private key.

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 );