diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-12-19 22:26:50 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-12-19 22:26:50 +0100 |
| commit | c7841a37fab60a9f017c4aa7ea3f0c9b0c2aba0d (patch) | |
| tree | 11f91d6724a69f82aff7ab10499bf060287ea14e /embassy-boot | |
| parent | 4567b874826e30f54dbd0e5d12b6f0243e284be3 (diff) | |
boot: update ed25519-dalek in dev-dependencies.
Diffstat (limited to 'embassy-boot')
| -rw-r--r-- | embassy-boot/boot/Cargo.toml | 10 | ||||
| -rw-r--r-- | embassy-boot/boot/src/lib.rs | 8 |
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" } | |||
| 32 | embedded-storage = "0.3.1" | 32 | embedded-storage = "0.3.1" |
| 33 | embedded-storage-async = { version = "0.4.1" } | 33 | embedded-storage-async = { version = "0.4.1" } |
| 34 | salty = { version = "0.3", optional = true } | 34 | salty = { version = "0.3", optional = true } |
| 35 | signature = { version = "2.2", default-features = false } | 35 | signature = { version = "2.0", default-features = false } |
| 36 | 36 | ||
| 37 | [dev-dependencies] | 37 | [dev-dependencies] |
| 38 | log = "0.4" | 38 | log = "0.4" |
| 39 | env_logger = "0.9" | 39 | env_logger = "0.9" |
| 40 | rand = "0.7" # ed25519-dalek v1.0.1 depends on this exact version | 40 | rand = "0.8" |
| 41 | futures = { version = "0.3", features = ["executor"] } | 41 | futures = { version = "0.3", features = ["executor"] } |
| 42 | sha1 = "0.10.5" | 42 | sha1 = "0.10.5" |
| 43 | critical-section = { version = "1.1.1", features = ["std"] } | 43 | critical-section = { version = "1.1.1", features = ["std"] } |
| 44 | 44 | ed25519-dalek = { version = "2", default_features = false, features = ["std", "rand_core", "digest"] } | |
| 45 | [dev-dependencies.ed25519-dalek] | ||
| 46 | version = "1.0.1" | ||
| 47 | default_features = false | ||
| 48 | features = ["rand", "std", "u32_backend"] | ||
| 49 | 45 | ||
| 50 | [features] | 46 | [features] |
| 51 | ed25519-dalek = ["dep:ed25519-dalek", "_verify"] | 47 | ed25519-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 { |
