commit 33939929430a3e5375976fdb45ee71bc5fea0206
author Yiping Peng <yibingp@internal.synopsys.com> Sun Sep 30 15:06:53 2018 +0800
committer Fabio Utzig <utzig@utzig.org> Fri Nov 09 08:12:29 2018 -0300
tree 9467d67000891fb1eda7eb67fb89080e20300ef2
parent 4d2052519505982c99679268c9f4390c195ccb10

Fixed an issue that supported later versions of mbedtls than mbedtls-2.6.1

Signed-off-by: Yiping Peng <836885645@qq.com>
Signed-off-by: Yiping Peng <yibingp@internal.synopsys.com>

boot/bootutil/src/image_rsa.c

diff --git a/boot/bootutil/src/image_rsa.c b/boot/bootutil/src/image_rsa.c
index 7a9ca15..0534c12 100644
--- a/boot/bootutil/src/image_rsa.c
+++ b/boot/bootutil/src/image_rsa.c
@@ -27,6 +27,7 @@
 
 #include "mbedtls/rsa.h"
 #include "mbedtls/asn1.h"
+#include "mbedtls/version.h"
 
 #include "bootutil_priv.h"
 
@@ -89,9 +90,18 @@
         return -4;
     }
 
-    if ((rc = mbedtls_rsa_check_pubkey(ctx)) != 0) {
+    /* The mbedtls version is more than 2.6.1 */
+#if MBEDTLS_VERSION_NUMBER > 0x02060100
+    rc = mbedtls_rsa_import(ctx, &ctx->N, NULL, NULL, NULL, &ctx->E);
+    if (rc != 0) {
         return -5;
     }
+#endif
+
+    rc = mbedtls_rsa_check_pubkey(ctx);
+    if (rc != 0) {
+        return -6;
+    }
 
     ctx->len = mbedtls_mpi_size(&ctx->N);