sim: Fit unit tests to larger write align values (7bfd14bb) · Commits · Wenxi XU / Mcuboot

.github/workflows/sim.yaml

+11 −10

Original line number	Diff line number	Diff line
		@@ -14,21 +14,22 @@ jobs:
		features:
		- "sig-ecdsa,sig-ecdsa-mbedtls,sig-ed25519,enc-kw,bootstrap"
		- "sig-rsa,sig-rsa3072,overwrite-only,validate-primary-slot,swap-move"
		- "enc-rsa"
		- "enc-aes256-rsa"
		- "enc-ec256"
		- "enc-aes256-ec256"
		- "enc-x25519"
		- "enc-aes256-x25519"
		- "sig-rsa overwrite-only large-write,sig-ecdsa overwrite-only large-write,sig-ecdsa-mbedtls overwrite-only large-write,multiimage overwrite-only large-write"
		- "enc-rsa,enc-rsa max-align-32"
		- "enc-aes256-rsa,enc-aes256-rsa max-align-32"
		- "enc-ec256,enc-ec256 max-align-32"
		- "enc-aes256-ec256,enc-aes256-ec256 max-align-32"
		- "enc-x25519,enc-x25519 max-align-32"
		- "enc-aes256-x25519,enc-aes256-x25519 max-align-32"
		- "sig-rsa overwrite-only,sig-ecdsa overwrite-only,sig-ecdsa-mbedtls overwrite-only,multiimage overwrite-only"
		- "sig-rsa validate-primary-slot,sig-ecdsa validate-primary-slot,sig-ecdsa-mbedtls validate-primary-slot,sig-rsa multiimage validate-primary-slot"
		- "enc-kw overwrite-only large-write,enc-rsa overwrite-only large-write"
		- "enc-aes256-kw overwrite-only large-write,enc-rsa overwrite-only large-write"
		- "enc-kw overwrite-only,enc-kw overwrite-only max-align-32"
		- "enc-rsa overwrite-only,enc-rsa overwrite-only max-align-32"
		- "enc-aes256-kw overwrite-only,enc-aes256-kw overwrite-only max-align-32"
		- "sig-rsa enc-rsa validate-primary-slot,swap-move enc-rsa sig-rsa validate-primary-slot bootstrap"
		- "sig-rsa enc-kw validate-primary-slot bootstrap,sig-ed25519 enc-x25519 validate-primary-slot"
		- "sig-ecdsa enc-kw validate-primary-slot"
		- "sig-ecdsa-mbedtls enc-kw validate-primary-slot"
		- "sig-rsa validate-primary-slot overwrite-only large-write"
		- "sig-rsa validate-primary-slot overwrite-only,sig-rsa validate-primary-slot overwrite-only max-align-32"
		- "sig-ecdsa enc-ec256 validate-primary-slot"
		- "sig-ecdsa-mbedtls enc-ec256-mbedtls validate-primary-slot"
		- "sig-ecdsa-mbedtls enc-aes256-ec256 validate-primary-slot"

sim/Cargo.toml

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,8 +28,8 @@ bootstrap = ["mcuboot-sys/bootstrap"]
		multiimage = ["mcuboot-sys/multiimage"]
		ram-load = ["mcuboot-sys/ram-load"]
		direct-xip = ["mcuboot-sys/direct-xip"]
		large-write = []
		downgrade-prevention = ["mcuboot-sys/downgrade-prevention"]
		max-align-32 = ["mcuboot-sys/max-align-32"]

		[dependencies]
		byteorder = "1.3"

sim/mcuboot-sys/Cargo.toml

+2 −3

Original line number	Diff line number	Diff line
		@@ -80,9 +80,8 @@ direct-xip = []
		# Check (in software) against version downgrades.
		downgrade-prevention = []

		# Large write. Not meaningful, but present here so that the
		# full-suite tests will work for this configuration.
		large-write = []
		# Support images with 32-byte maximum write alignment value.
		max-align-32 = []

		[build-dependencies]
		cc = "1.0.25"

sim/mcuboot-sys/build.rs

+7 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,13 @@ fn main() {
		conf.conf.define("MCUBOOT_USE_FLASH_AREA_GET_SECTORS", None);
		conf.conf.define("MCUBOOT_HAVE_ASSERT_H", None);
		conf.conf.define("MCUBOOT_MAX_IMG_SECTORS", Some("128"));

		#[cfg(not(feature = "max-align-32"))]
		conf.conf.define("MCUBOOT_BOOT_MAX_ALIGN", Some("8"));

		#[cfg(feature = "max-align-32")]
		conf.conf.define("MCUBOOT_BOOT_MAX_ALIGN", Some("32"));

		conf.conf.define("MCUBOOT_IMAGE_NUMBER", Some(if multiimage { "2" } else { "1" }));

		if downgrade_prevention && !overwrite_only {

sim/mcuboot-sys/csupport/run.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -477,5 +477,5 @@ uint32_t boot_max_align(void)

		uint32_t boot_magic_sz(void)
		{
		return BOOT_MAGIC_SZ;
		return BOOT_MAGIC_ALIGN_SIZE;
		}

Admin message