Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 02:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

use old secret key derivation function (#2482)

Browse Source 
* use old secret key derivation function

* compat

* cargo
This commit is contained in:
Aiden McClelland
2023-10-27 17:32:21 -06:00
committed by GitHub
parent 0865cffddf
commit 182a095420
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
backend/Cargo.lock generated
View File

@@ -4911,6 +4911,7 @@ dependencies = [
"digest 0.10.7", "digest 0.10.7",
"divrem", "divrem",
"ed25519 2.2.3", "ed25519 2.2.3",
"ed25519-dalek 1.0.1",
"ed25519-dalek 2.0.0", "ed25519-dalek 2.0.0",
"embassy_container_init", "embassy_container_init",
"emver", "emver",

2
backend/Cargo.toml
View File

@@ -66,11 +66,11 @@ divrem = "1.0.0"
ed25519 = { version = "2.2.3", features = ["pkcs8", "pem", "alloc"] } ed25519 = { version = "2.2.3", features = ["pkcs8", "pem", "alloc"] }
ed25519-dalek = { version = "2.0.0", features = [ ed25519-dalek = { version = "2.0.0", features = [
"serde", "serde",
"hazmat",
"zeroize", "zeroize",
"rand_core", "rand_core",
"digest", "digest",
] } ] }
ed25519-dalek-v1 = { package = "ed25519-dalek", version = "1" }
embassy_container_init = { path = "../libs/embassy_container_init" } embassy_container_init = { path = "../libs/embassy_container_init" }
emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [ emver = { version = "0.1.7", git = "https://github.com/Start9Labs/emver-rs.git", features = [
"serde", "serde",

12
backend/src/util/crypto.rs
View File

@@ -1,13 +1,9 @@
use ed25519_dalek::hazmat::ExpandedSecretKey;
use ed25519_dalek::{SecretKey, EXPANDED_SECRET_KEY_LENGTH}; use ed25519_dalek::{SecretKey, EXPANDED_SECRET_KEY_LENGTH};
#[inline] #[inline]
pub fn ed25519_expand_key(key: &SecretKey) -> [u8; EXPANDED_SECRET_KEY_LENGTH] { pub fn ed25519_expand_key(key: &SecretKey) -> [u8; EXPANDED_SECRET_KEY_LENGTH] {
let key = ExpandedSecretKey::from(key); ed25519_dalek_v1::ExpandedSecretKey::from(
&ed25519_dalek_v1::SecretKey::from_bytes(key).unwrap(),
let mut bytes: [u8; 64] = [0u8; 64]; )
.to_bytes()
bytes[..32].copy_from_slice(key.scalar.as_bytes());
bytes[32..].copy_from_slice(&key.hash_prefix[..]);
bytes
} }

1
system-images/compat/Cargo.lock generated
View File

@@ -4421,6 +4421,7 @@ dependencies = [
"digest 0.10.7", "digest 0.10.7",
"divrem", "divrem",
"ed25519 2.2.3", "ed25519 2.2.3",
"ed25519-dalek 1.0.1",
"ed25519-dalek 2.0.0", "ed25519-dalek 2.0.0",
"embassy_container_init", "embassy_container_init",
"emver", "emver",