use old secret key derivation function (#2482)

* use old secret key derivation function * compat * cargo
Start9Labs · Oct 27, 2023 · 182a095 · 182a095
1 parent 0865cff
commit 182a095
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -66,11 +66,11 @@ divrem = "1.0.0"
 ed25519 = { version = "2.2.3", features = ["pkcs8", "pem", "alloc"] }
 ed25519-dalek = { version = "2.0.0", features = [
   "serde",
-  "hazmat",
   "zeroize",
   "rand_core",
   "digest",
 ] }
+ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
 embassy_container_init = { path = "../libs/embassy_container_init" }
 emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
   "serde",

diff --git a/backend/src/util/crypto.rs b/backend/src/util/crypto.rs
@@ -1,13 +1,9 @@
-use ed25519_dalek::hazmat::ExpandedSecretKey;
 use ed25519_dalek::{SecretKey, EXPANDED_SECRET_KEY_LENGTH};
 
 #[inline]
 pub fn ed25519_expand_key(key: &SecretKey) -> [u8; EXPANDED_SECRET_KEY_LENGTH] {
-    let key = ExpandedSecretKey::from(key);
-
-    let mut bytes: [u8; 64] = [0u8; 64];
-
-    bytes[..32].copy_from_slice(key.scalar.as_bytes());
-    bytes[32..].copy_from_slice(&key.hash_prefix[..]);
-    bytes
+    ed25519_dalek_v1::ExpandedSecretKey::from(
+        &ed25519_dalek_v1::SecretKey::from_bytes(key).unwrap(),
+    )
+    .to_bytes()
 }
diff --git a/system-images/compat/Cargo.lock b/system-images/compat/Cargo.lock