commit 66b4caac452c5945042a76a15d4492d5de5137bb
author Fabio Utzig <utzig@apache.org> Sat Jan 04 20:19:28 2020 -0300
committer Fabio Utzig <utzig@utzig.org> Tue Jan 07 16:03:55 2020 -0300
tree 771fa97c6b90c4b41b6c7c0b43b02017fa4c237c
parent 729139f80fd40c736861b77349dd839402f8fb85

sim: allow generation of non-signed + encrypted EC 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 b7f8ed6..fe97f12 100644
--- a/sim/src/image.rs
+++ b/sim/src/image.rs
@@ -1267,8 +1267,11 @@
             TlvGen::new_enc_rsa()
         }
     } else if Caps::EncEc256.present() {
-        //FIXME: should fail with RSA signature?
-        TlvGen::new_ecdsa_ecies_p256()
+        if Caps::EcdsaP256.present() {
+            TlvGen::new_ecdsa_ecies_p256()
+        } else {
+            TlvGen::new_ecies_p256()
+        }
     } else {
         // The non-encrypted configuration.
         if Caps::RSA2048.present() {

sim/src/tlv.rs

diff --git a/sim/src/tlv.rs b/sim/src/tlv.rs
index c4bd54e..80d82ae 100644
--- a/sim/src/tlv.rs
+++ b/sim/src/tlv.rs
@@ -215,6 +215,16 @@
     }
 
     #[allow(dead_code)]
+    pub fn new_ecies_p256() -> TlvGen {
+        TlvGen {
+            flags: TlvFlags::ENCRYPTED as u32,
+            kinds: vec![TlvKinds::SHA256, TlvKinds::ENCEC256],
+            size: 4 + 32 + 4 + 32 + 4 + 113,
+            ..Default::default()
+        }
+    }
+
+    #[allow(dead_code)]
     pub fn new_ecdsa_ecies_p256() -> TlvGen {
         TlvGen {
             flags: TlvFlags::ENCRYPTED as u32,