fix: don't break hosted mode

This commit is contained in:
David Kotval 2024-02-07 13:56:02 -06:00
parent 6de48e90f3
commit e619803114
3 changed files with 7 additions and 10 deletions

7
Cargo.lock generated
View file

@ -1175,7 +1175,8 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]]
name = "curve25519-dalek"
version = "3.2.1"
source = "git+https://github.com/betrusted-io/curve25519-dalek.git?branch=main#b8f71e85d1e251aeeea4fe0da8ff8c8815e51c69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
dependencies = [
"byteorder",
"digest 0.9.0",
@ -1187,8 +1188,6 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
dependencies = [
"cfg-if",
"cpufeatures",
@ -1203,8 +1202,6 @@ dependencies = [
[[package]]
name = "curve25519-dalek-derive"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",

View file

@ -144,9 +144,9 @@ sha2_legacy = { git = "https://github.com/RustCrypto/hashes.git", tag = "sha2-v0
path = "services/aes"
[patch.crates-io.curve25519-dalek]
git = "https://github.com/betrusted-io/curve25519-dalek.git"
branch = "main"
#path = "../curve25519-dalek" # when doing local dev work
#git = "https://github.com/betrusted-io/curve25519-dalek.git"
#branch = "main"
path = "../curve25519-dalek/curve25519-dalek" # when doing local dev work
# feature overrides are specified at the crate level
[patch."https://github.com/betrusted-io/xous-engine-25519.git"]

View file

@ -99,7 +99,7 @@ mod implementation {
use aes::cipher::{generic_array::GenericArray, BlockDecrypt, BlockEncrypt, KeyInit};
use aes::Aes256;
use ed25519_dalek::PublicKey;
use ed25519_dalek::VerifyingKey;
use gam::modal::{Modal, Slider};
use gam::{ActionType, ProgressBar};
use locales::t;
@ -255,7 +255,7 @@ mod implementation {
pub fn finish_key_init(&mut self) {}
pub fn verify_gateware_self_signature(&mut self, _pk: Option<&PublicKey>) -> bool { true }
pub fn verify_gateware_self_signature(&mut self, _pk: Option<&VerifyingKey>) -> bool { true }
pub fn test(
&mut self,