commit 506498eaa3a98287ca3ccd17f4520a7593e2b195
author Gilles Peskine <gilles.peskine@arm.com> Tue Sep 22 18:52:03 2020 +0200
committer GitHub <noreply@github.com> Tue Sep 22 18:52:03 2020 +0200
tree 4397cf42d1ee95c647cca4ff34d6c1a0d7e803d2
parent e72c8d28f10417a1a5e93926b34b50528f48d68e
parent 84d4f022e23517924bae08553659a807d53a0a37

Merge pull request #3708 from ronald-cron-arm/feature/fix_return_code_1-2.16

Backport 2.16: Fix return code expression in pkparse

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 086807d..e410f3a 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -692,7 +692,7 @@
         ret = MBEDTLS_ERR_PK_UNKNOWN_PK_ALG;
 
     if( ret == 0 && *p != end )
-        ret = MBEDTLS_ERR_PK_INVALID_PUBKEY
+        ret = MBEDTLS_ERR_PK_INVALID_PUBKEY +
               MBEDTLS_ERR_ASN1_LENGTH_MISMATCH;
 
     if( ret != 0 )