diff --git a/firmware/Cargo.lock b/firmware/Cargo.lock index 1006a05..db424fc 100644 --- a/firmware/Cargo.lock +++ b/firmware/Cargo.lock @@ -6853,7 +6853,6 @@ checksum = "a0f368519fc6c85fc1afdb769fb5a51123f6158013e143656e25a3485a0d401c" [[package]] name = "spectre-api-sys" version = "0.1.0" -source = "git+https://github.com/Limeth/spectre-api-sys#9e844eb056c3dfee8286ac21ec40fa689a8b8aa2" dependencies = [ "bindgen", "cc", diff --git a/firmware/Cargo.toml b/firmware/Cargo.toml index bd1464b..dc9431b 100644 --- a/firmware/Cargo.toml +++ b/firmware/Cargo.toml @@ -2,3 +2,6 @@ resolver = "3" members = ["acid-firmware", "password-hash"] default-members = [] + +[workspace.dependencies] +spectre-api-sys = { git = "https://github.com/Limeth/spectre-api-sys", rev = "9e844eb056c3dfee8286ac21ec40fa689a8b8aa2" } diff --git a/firmware/acid-firmware/Cargo.toml b/firmware/acid-firmware/Cargo.toml index 5b68cc0..b79abee 100644 --- a/firmware/acid-firmware/Cargo.toml +++ b/firmware/acid-firmware/Cargo.toml @@ -73,7 +73,7 @@ rtt-target = { version = "0.6.2", features = ["log"], optional = true } panic-rtt-target = { version = "0.2.0", optional = true } enumset = "1.1.10" printf-compat = { version = "0.2.1", default-features = false } # Kept older because of the outdated esp toolchain's VaList -spectre-api-sys = { git = "https://github.com/Limeth/spectre-api-sys" } +spectre-api-sys = { workspace = true } sha2 = { version = "0.10.9", default-features = false } password-hash = { path = "../password-hash", default-features = false } hmac = "0.12.1" diff --git a/firmware/password-hash/Cargo.toml b/firmware/password-hash/Cargo.toml index 1b1863b..274006c 100644 --- a/firmware/password-hash/Cargo.toml +++ b/firmware/password-hash/Cargo.toml @@ -21,7 +21,7 @@ cmd = ["std", "dep:scrypt", "dep:itertools", "dep:spectre-api-sys", "dep:byteord argon2 = { version = "0.5.3", default-features = false, features = ["alloc"] } itertools = { version = "0.14.0", optional = true } scrypt = { version = "0.11.0", default-features = false, optional = true } -spectre-api-sys = { git = "https://github.com/Limeth/spectre-api-sys", optional = true } +spectre-api-sys = { workspace = true, optional = true } byteorder = { version = "1.5.0", optional = true } # TODO: Why is this unable to provide the symbols for spectre-api-sys? # libsodium-sys-stable = { version = "1.23.2", optional = true }