commit 25c7a0f4757718030de060befb723636e7d5483f
author Bohdan Kovalchuk <bohd@cypress.com> Mon Nov 30 21:32:14 2020 +0200
committer Fabio Utzig <utzig@utzig.org> Tue Mar 16 21:38:06 2021 -0300
tree f6af7534e891dea305b1a874e6a0c3ff670e43bf
parent 837cf88f35d0cc0d7d54fe050d2dc58cfab967c0

Bootutil/Crypto: add encryption with mbedTLS

Signed-off-by: Bohdan Kovalchuk <bohd@cypress.com>
Signed-off-by: Roman Okhrimenko <roman.okhrimenko@infineon.com>

boot/bootutil/src/encrypted.c

diff --git a/boot/bootutil/src/encrypted.c b/boot/bootutil/src/encrypted.c
index aff2d45..d14855b 100644
--- a/boot/bootutil/src/encrypted.c
+++ b/boot/bootutil/src/encrypted.c
@@ -437,7 +437,7 @@
 #    define EXPECTED_ENC_TLV    IMAGE_TLV_ENC_KW128
 #elif defined(MCUBOOT_ENCRYPT_EC256)
 #    define EXPECTED_ENC_TLV    IMAGE_TLV_ENC_EC256
-#    define EC_PUBK_INDEX       (1)
+#    define EC_PUBK_INDEX       (0)
 #    define EC_TAG_INDEX        (65)
 #    define EC_CIPHERKEY_INDEX  (65 + 32)
 _Static_assert(EC_CIPHERKEY_INDEX + 16 == EXPECTED_ENC_LEN,
@@ -526,11 +526,6 @@
         return rc;
     }
 
-    /* is EC point uncompressed? */
-    if (buf[0] != 0x04) {
-        return -1;
-    }
-
     /*
      * First "element" in the TLV is the curve point (public key)
      */
@@ -603,7 +598,7 @@
         return -1;
     }
 
-    /* Assumes the tag bufer is at least sizeof(hmac_tag_size(state)) bytes */
+    /* Assumes the tag buffer is at least sizeof(hmac_tag_size(state)) bytes */
     rc = bootutil_hmac_sha256_finish(&hmac, tag, BOOTUTIL_CRYPTO_SHA256_DIGEST_SIZE);
     if (rc != 0) {
         (void)bootutil_hmac_sha256_drop(&hmac);