commit 2983b27a08141bd5fd56fa1570b4fa58c9766744
author Gilles Peskine <gilles.peskine@arm.com> Tue Sep 22 18:52:09 2020 +0200
committer GitHub <noreply@github.com> Tue Sep 22 18:52:09 2020 +0200
tree a524b81405729f77e01a79f96f00d904cc9d8823
parent dc5fd035e6d2cabc19aeb3ce79b0ae9174f2602e
parent 45a595845d66f5d3d185b2019630916b28318444

Merge pull request #3707 from ronald-cron-arm/feature/fix_return_code_1-2.7

Backport 2.7: Fix return code expression in pkparse

library/pkparse.c

diff --git a/library/pkparse.c b/library/pkparse.c
index 77d48c1..f54ed54 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -678,7 +678,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 )