commit feb6c4cd409b9930561516da4dd80615f6710a3e
author Fabio Utzig <utzig@apache.org> Thu Apr 02 10:28:39 2020 -0300
committer Fabio Utzig <utzig@utzig.org> Fri Apr 10 17:56:14 2020 -0300
tree c2716a41c1a2d4313df59352f8463fd5d8839972
parent 8fcdb6d06628fcb6b808b10aabe8a70ccd2e1061

caps: Add cap for x25519 based image encryption

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

boot/bootutil/include/bootutil/caps.h

diff --git a/boot/bootutil/include/bootutil/caps.h b/boot/bootutil/include/bootutil/caps.h
index 3205fa2..6f3806e 100644
--- a/boot/bootutil/include/bootutil/caps.h
+++ b/boot/bootutil/include/bootutil/caps.h
@@ -45,6 +45,7 @@
 #define BOOTUTIL_CAP_ENC_EC256              (1<<10)
 #define BOOTUTIL_CAP_SWAP_USING_MOVE        (1<<11)
 #define BOOTUTIL_CAP_DOWNGRADE_PREVENTION   (1<<12)
+#define BOOTUTIL_CAP_ENC_X25519             (1<<13)
 
 /*
  * Query the number of images this bootloader is configured for.  This

boot/bootutil/src/caps.c

diff --git a/boot/bootutil/src/caps.c b/boot/bootutil/src/caps.c
index c15ecb5..a59a01d 100644
--- a/boot/bootutil/src/caps.c
+++ b/boot/bootutil/src/caps.c
@@ -54,6 +54,9 @@
 #if defined(MCUBOOT_ENCRYPT_EC256)
     res |= BOOTUTIL_CAP_ENC_EC256;
 #endif
+#if defined(MCUBOOT_ENCRYPT_X25519)
+    res |= BOOTUTIL_CAP_ENC_X25519;
+#endif
 #if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT)
     res |= BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT;
 #endif

sim/src/caps.rs

diff --git a/sim/src/caps.rs b/sim/src/caps.rs
index f823b99..edffd0c 100644
--- a/sim/src/caps.rs
+++ b/sim/src/caps.rs
@@ -23,6 +23,7 @@
     EncEc256             = (1 << 10),
     SwapUsingMove        = (1 << 11),
     DowngradePrevention  = (1 << 12),
+    EncX25519            = (1 << 13),
 }
 
 impl Caps {