commit 1c7d959eeb3130237190043128bcd2b651fc69d6
author Fabio Utzig <utzig@apache.org> Mon Dec 03 10:35:56 2018 -0200
committer Fabio Utzig <utzig@utzig.org> Tue Dec 04 14:21:52 2018 -0200
tree 964d428118425ac8fec1a4e60e063282340762d8
parent 38609e0c9cb4c0d28c1f554ec8d55237897ee3ee

Fix rebase issue

Signed-off-by: Fabio Utzig <utzig@apache.org>

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index e7c8d73..996b49f 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -1202,7 +1202,6 @@
     const struct flash_area *fap;
     uint8_t slot;
     uint8_t i;
-    uint8_t enckey[BOOT_ENC_KEY_SIZE];
 #endif
     uint32_t size;
     uint32_t copy_size;
@@ -1286,7 +1285,7 @@
             assert(rc == 0);
 
             for (i = 0; i < BOOT_ENC_KEY_SIZE; i++) {
-                if (enckey[i] != 0xff) {
+                if (bs->enckey[slot][i] != 0xff) {
                     break;
                 }
             }