aboutsummaryrefslogtreecommitdiff
path: root/embassy-boot
diff options
context:
space:
mode:
Diffstat (limited to 'embassy-boot')
-rw-r--r--embassy-boot/boot/Cargo.toml10
-rw-r--r--embassy-boot/boot/src/lib.rs8
2 files changed, 6 insertions, 12 deletions
diff --git a/embassy-boot/boot/Cargo.toml b/embassy-boot/boot/Cargo.toml
index e47776d62..3c84ffcd3 100644
--- a/embassy-boot/boot/Cargo.toml
+++ b/embassy-boot/boot/Cargo.toml
@@ -32,20 +32,16 @@ embassy-sync = { version = "0.5.0", path = "../../embassy-sync" }
32embedded-storage = "0.3.1" 32embedded-storage = "0.3.1"
33embedded-storage-async = { version = "0.4.1" } 33embedded-storage-async = { version = "0.4.1" }
34salty = { version = "0.3", optional = true } 34salty = { version = "0.3", optional = true }
35signature = { version = "2.2", default-features = false } 35signature = { version = "2.0", default-features = false }
36 36
37[dev-dependencies] 37[dev-dependencies]
38log = "0.4" 38log = "0.4"
39env_logger = "0.9" 39env_logger = "0.9"
40rand = "0.7" # ed25519-dalek v1.0.1 depends on this exact version 40rand = "0.8"
41futures = { version = "0.3", features = ["executor"] } 41futures = { version = "0.3", features = ["executor"] }
42sha1 = "0.10.5" 42sha1 = "0.10.5"
43critical-section = { version = "1.1.1", features = ["std"] } 43critical-section = { version = "1.1.1", features = ["std"] }
44 44ed25519-dalek = { version = "2", default_features = false, features = ["std", "rand_core", "digest"] }
45[dev-dependencies.ed25519-dalek]
46version = "1.0.1"
47default_features = false
48features = ["rand", "std", "u32_backend"]
49 45
50[features] 46[features]
51ed25519-dalek = ["dep:ed25519-dalek", "_verify"] 47ed25519-dalek = ["dep:ed25519-dalek", "_verify"]
diff --git a/embassy-boot/boot/src/lib.rs b/embassy-boot/boot/src/lib.rs
index 15b69f69d..b4f03e01e 100644
--- a/embassy-boot/boot/src/lib.rs
+++ b/embassy-boot/boot/src/lib.rs
@@ -275,21 +275,19 @@ mod tests {
275 // The following key setup is based on: 275 // The following key setup is based on:
276 // https://docs.rs/ed25519-dalek/latest/ed25519_dalek/#example 276 // https://docs.rs/ed25519-dalek/latest/ed25519_dalek/#example
277 277
278 use ed25519_dalek::Keypair; 278 use ed25519_dalek::{Digest, Sha512, Signature, Signer, SigningKey, VerifyingKey};
279 use rand::rngs::OsRng; 279 use rand::rngs::OsRng;
280 280
281 let mut csprng = OsRng {}; 281 let mut csprng = OsRng {};
282 let keypair: Keypair = Keypair::generate(&mut csprng); 282 let keypair = SigningKey::generate(&mut csprng);
283 283
284 use ed25519_dalek::{Digest, Sha512, Signature, Signer};
285 let firmware: &[u8] = b"This are bytes that would otherwise be firmware bytes for DFU."; 284 let firmware: &[u8] = b"This are bytes that would otherwise be firmware bytes for DFU.";
286 let mut digest = Sha512::new(); 285 let mut digest = Sha512::new();
287 digest.update(&firmware); 286 digest.update(&firmware);
288 let message = digest.finalize(); 287 let message = digest.finalize();
289 let signature: Signature = keypair.sign(&message); 288 let signature: Signature = keypair.sign(&message);
290 289
291 use ed25519_dalek::PublicKey; 290 let public_key = keypair.verifying_key();
292 let public_key: PublicKey = keypair.public;
293 291
294 // Setup flash 292 // Setup flash
295 let flash = BlockingTestFlash::new(BootLoaderConfig { 293 let flash = BlockingTestFlash::new(BootLoaderConfig {