commit 795cd0d5937e1423e5f6c92dbd86bc656dd481aa
author Sigvart Hovland <sigvart.m@gmail.com> Mon Mar 04 13:06:12 2019 +0100
committer Fabio Utzig <utzig@utzig.org> Mon Mar 25 07:12:34 2019 -0300
tree 7ff31c033abc38a9f15d9659def65be0e9cd28e0
parent 3999a759d2f7e38b46415adace767833c09843ac

boot: bootutil: Change ec256 so that it can support multiple interfaces

Change ec256 interface so that it could support multiple interfaces in
the future.

Signed-off-by: Sigvart Hovland <sigvart.m@gmail.com>

boot/bootutil/src/image_ec256.c

diff --git a/boot/bootutil/src/image_ec256.c b/boot/bootutil/src/image_ec256.c
index dbaea76..3511404 100644
--- a/boot/bootutil/src/image_ec256.c
+++ b/boot/bootutil/src/image_ec256.c
@@ -27,7 +27,9 @@
 #include "mbedtls/oid.h"
 #include "mbedtls/asn1.h"
 
+#ifdef MCUBOOT_USE_TINYCRYPT
 #include "tinycrypt/ecc_dsa.h"
+#endif
 #include "bootutil_priv.h"
 
 /*
@@ -40,7 +42,7 @@
  * Parse the public key used for signing.
  */
 static int
-tinycrypt_import_key(uint8_t **cp, uint8_t *end)
+bootutil_import_key(uint8_t **cp, uint8_t *end)
 {
     size_t len;
     mbedtls_asn1_buf alg;
@@ -91,7 +93,7 @@
  * Verify the tag, and that the length is 32 bytes.
  */
 static int
-tinycrypt_read_bigint(uint8_t i[NUM_ECC_BYTES], uint8_t **cp, uint8_t *end)
+bootutil_read_bigint(uint8_t i[NUM_ECC_BYTES], uint8_t **cp, uint8_t *end)
 {
     size_t len;
 
@@ -113,7 +115,7 @@
  * Read in signature. Signature has r and s encoded as integers.
  */
 static int
-tinycrypt_decode_sig(uint8_t signature[NUM_ECC_BYTES * 2], uint8_t *cp, uint8_t *end)
+bootutil_decode_sig(uint8_t signature[NUM_ECC_BYTES * 2], uint8_t *cp, uint8_t *end)
 {
     int rc;
     size_t len;
@@ -127,17 +129,18 @@
         return -2;
     }
 
-    rc = tinycrypt_read_bigint(signature, &cp, end);
+    rc = bootutil_read_bigint(signature, &cp, end);
     if (rc) {
         return -3;
     }
-    rc = tinycrypt_read_bigint(signature + NUM_ECC_BYTES, &cp, end);
+    rc = bootutil_read_bigint(signature + NUM_ECC_BYTES, &cp, end);
     if (rc) {
         return -4;
     }
     return 0;
 }
 
+#if defined(MCUBOOT_USE_TINYCRYPT)
 int
 bootutil_verify_sig(uint8_t *hash, uint32_t hlen, uint8_t *sig, size_t slen,
   uint8_t key_id)
@@ -151,12 +154,12 @@
     pubkey = (uint8_t *)bootutil_keys[key_id].key;
     end = pubkey + *bootutil_keys[key_id].len;
 
-    rc = tinycrypt_import_key(&pubkey, end);
+    rc = bootutil_import_key(&pubkey, end);
     if (rc) {
         return -1;
     }
 
-    rc = tinycrypt_decode_sig(signature, sig, sig + slen);
+    rc = bootutil_decode_sig(signature, sig, sig + slen);
     if (rc) {
         return -1;
     }
@@ -175,4 +178,5 @@
         return -2;
     }
 }
+#endif /* MCUBOOT_USE_TINYCRYPT */
 #endif /* MCUBOOT_SIGN_EC256 */