commit 9b7a25833b364d40eda86305f39c6969b306db79
author Fabio Utzig <utzig@apache.org> Mon Dec 03 10:40:05 2018 -0200
committer Fabio Utzig <utzig@utzig.org> Tue Dec 04 14:21:52 2018 -0200
tree 007e03f287330c1ac2f24f9e769c8c141b16ea7d
parent e641ea5ee55cb03507cbc8c3b7fd08c87121cb2f

Fix overwrite-only encrypted images in sim

Also add overwrite-only + encrypted tests to travis-ci.

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 54e0bd2..813e0b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,8 @@
       env: MULTI_FEATURES="sig-rsa overwrite-only,sig-ecdsa overwrite-only"
     - os: linux
       env: MULTI_FEATURES="sig-rsa validate-slot0,sig-ecdsa validate-slot0"
+    - os: linux
+      env: MULTI_FEATURES="enc-kw overwrite-only,enc-rsa overwrite-only"
 
     # FIXME: this test actually fails and must be fixed
     #- os: linux

sim/src/lib.rs

diff --git a/sim/src/lib.rs b/sim/src/lib.rs
index e7ad671..47d20eb 100644
--- a/sim/src/lib.rs
+++ b/sim/src/lib.rs
@@ -695,11 +695,13 @@
     }
 
     #[cfg(feature = "enc-rsa")]
+    #[cfg(not(feature = "overwrite-only"))]
     fn status_sz(&self) -> usize {
         self.trailer_sz() - (16 + 24 + 32)
     }
 
     #[cfg(feature = "enc-kw")]
+    #[cfg(not(feature = "overwrite-only"))]
     fn status_sz(&self) -> usize {
         self.trailer_sz() - (16 + 24 + 32)
     }