commit 3fa72ca12ffd987f4e1787e55cddbfefbe375a45
author Fabio Utzig <utzig@apache.org> Thu Apr 02 11:20:37 2020 -0300
committer Fabio Utzig <utzig@utzig.org> Fri Apr 10 17:56:14 2020 -0300
tree 289e41ba84d47f326c2d24c4f79bf0a2280756a6
parent 6aec6ae0b0cba043267b189baef53f5f79a3a89e

sim: Add test support for x25519 encrypted images

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

sim/src/image.rs

diff --git a/sim/src/image.rs b/sim/src/image.rs
index 2c99694..420a14f 100644
--- a/sim/src/image.rs
+++ b/sim/src/image.rs
@@ -1310,6 +1310,12 @@
         } else {
             TlvGen::new_ecies_p256()
         }
+    } else if Caps::EncX25519.present() {
+        if Caps::Ed25519.present() {
+            TlvGen::new_ed25519_ecies_x25519()
+        } else {
+            TlvGen::new_ecies_x25519()
+        }
     } else {
         // The non-encrypted configuration.
         if Caps::RSA2048.present() {
@@ -1331,7 +1337,7 @@
     /// is unencrypted, and slot 1 is encrypted.
     fn find(&self, slot: usize) -> &Vec<u8> {
         let encrypted = Caps::EncRsa.present() || Caps::EncKw.present() ||
-            Caps::EncEc256.present();
+            Caps::EncEc256.present() || Caps::EncX25519.present();
         match (encrypted, slot) {
             (false, _) => &self.plain,
             (true, 0) => &self.plain,