mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
fix hosted and renode modes
This commit is contained in:
parent
2f66801806
commit
40423f9448
9 changed files with 29 additions and 26 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -4464,7 +4464,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sha2"
|
name = "sha2"
|
||||||
version = "0.10.8"
|
version = "0.10.8"
|
||||||
source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#9a2d88c142edb1b99c49dcd559f66367c6c17fc2"
|
source = "git+https://github.com/betrusted-io/hashes.git?branch=sha2-v0.10.8-xous#899876dcf233eb50ea0ccf8d5cfeb874bba06334"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cpufeatures",
|
"cpufeatures",
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ sha1 = "0.10.6"
|
||||||
hmac = "0.12.1"
|
hmac = "0.12.1"
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
base32 = "0.4.0"
|
base32 = "0.4.0"
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
sntpc = { version = "0.3.1" }
|
sntpc = { version = "0.3.1" }
|
||||||
net = { path = "../../services/net" }
|
net = { path = "../../services/net" }
|
||||||
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
|
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ p256 = { version = "0.10.1", default-features = false, features = [
|
||||||
] }
|
] }
|
||||||
cbc = "0.1.2"
|
cbc = "0.1.2"
|
||||||
aes = { path = "../../../../services/aes" }
|
aes = { path = "../../../../services/aes" }
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
|
|
||||||
log = "0.4.14" # xous debugging
|
log = "0.4.14" # xous debugging
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ pddb = { path = "../../services/pddb" }
|
||||||
der = { version = "0.7.6", features = ["derive"] }
|
der = { version = "0.7.6", features = ["derive"] }
|
||||||
locales = { path = "../../locales" }
|
locales = { path = "../../locales" }
|
||||||
rkyv = "0.4.3"
|
rkyv = "0.4.3"
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
|
|
||||||
# note requirement for patch to xous-ring in workspace Cargo.toml
|
# note requirement for patch to xous-ring in workspace Cargo.toml
|
||||||
rustls = { version = "0.21.7", features = ["dangerous_configuration"] }
|
rustls = { version = "0.21.7", features = ["dangerous_configuration"] }
|
||||||
|
|
@ -33,3 +33,6 @@ x509-parser = "0.15.0"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
rootCA = ["webpki-roots"]
|
rootCA = ["webpki-roots"]
|
||||||
|
precursor = ["sha2/precursor"]
|
||||||
|
hosted = ["sha2/hosted"]
|
||||||
|
renode = ["sha2/renode"]
|
||||||
|
|
|
||||||
|
|
@ -40,15 +40,15 @@ miniz_oxide = "0.4.4"
|
||||||
|
|
||||||
# used in bip39 dialogue
|
# used in bip39 dialogue
|
||||||
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
|
hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
|
|
||||||
utralib = { version = "0.1.24", optional = true, default-features = false }
|
utralib = { version = "0.1.24", optional = true, default-features = false }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor", "sha2/precursor"]
|
||||||
hosted = ["utralib/hosted"]
|
hosted = ["utralib/hosted", "sha2/hosted"]
|
||||||
renode = ["utralib/renode"]
|
renode = ["utralib/renode", "sha2/renode"]
|
||||||
debugprint = []
|
debugprint = []
|
||||||
tts = []
|
tts = []
|
||||||
# default = ["debugprint"] # "debugprint"
|
# default = ["debugprint"] # "debugprint"
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ tts-frontend = { path = "../tts" }
|
||||||
rand_core = "0.5.1"
|
rand_core = "0.5.1"
|
||||||
|
|
||||||
# passwords
|
# passwords
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
hkdf = "0.12.4"
|
hkdf = "0.12.4"
|
||||||
zeroize = "1.3.0"
|
zeroize = "1.3.0"
|
||||||
|
|
@ -63,9 +63,9 @@ hex = { version = "0.4.3", default-features = false, features = [
|
||||||
], optional = true }
|
], optional = true }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor", "sha2/precursor"]
|
||||||
hosted = ["utralib/hosted"]
|
hosted = ["utralib/hosted", "sha2/hosted"]
|
||||||
renode = ["utralib/renode"]
|
renode = ["utralib/renode", "sha2/renode"]
|
||||||
# when selected, physical disk addresses are set to 64 bits, otherwise, they are 32 bits.
|
# when selected, physical disk addresses are set to 64 bits, otherwise, they are 32 bits.
|
||||||
# 32 bit addressing is recommended for Precursor, as its disk is only 128MiB and it has limited RAM for bookkeeping.
|
# 32 bit addressing is recommended for Precursor, as its disk is only 128MiB and it has limited RAM for bookkeeping.
|
||||||
u64_pa = []
|
u64_pa = []
|
||||||
|
|
|
||||||
|
|
@ -62,11 +62,11 @@ keyboard = { path = "../keyboard" }
|
||||||
|
|
||||||
# private keys
|
# private keys
|
||||||
#sha2 = {version = "0.9.5", default-features = false, features = []}
|
#sha2 = {version = "0.9.5", default-features = false, features = []}
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
aes = { path = "../aes" }
|
aes = { path = "../aes" }
|
||||||
engine-25519 = { path = "../engine-25519" }
|
engine-25519 = { path = "../engine-25519" }
|
||||||
byteorder = "1.4.3" # used by keywrap
|
byteorder = "1.4.3" # used by keywrap
|
||||||
# hardware acceleration adaptations are inserted into a fork of the main branch.
|
# hardware acceleration adaptations are inserted into a fork of the main branch.
|
||||||
hex = { version = "0.4.3", default-features = false, features = [] }
|
hex = { version = "0.4.3", default-features = false, features = [] }
|
||||||
|
|
||||||
|
|
@ -82,9 +82,9 @@ default-features = false
|
||||||
features = ["u32_backend", "rand"]
|
features = ["u32_backend", "rand"]
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor", "sha2/precursor"]
|
||||||
hosted = ["utralib/hosted"]
|
hosted = ["utralib/hosted", "sha2/hosted"]
|
||||||
renode = ["utralib/renode"]
|
renode = ["utralib/renode", "sha2/renode"]
|
||||||
policy-menu = [
|
policy-menu = [
|
||||||
] # provisions for users to set their password retention policies (on the block for deprecation) (note: to re-enable you need to add "rootkeys menu" to the tokens.rs in the GAM)
|
] # provisions for users to set their password retention policies (on the block for deprecation) (note: to re-enable you need to add "rootkeys menu" to the tokens.rs in the GAM)
|
||||||
hazardous-debug = [
|
hazardous-debug = [
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ xous-names = { package = "xous-api-names", version = "0.9.55" }
|
||||||
keyboard = { path = "../keyboard" }
|
keyboard = { path = "../keyboard" }
|
||||||
susres = { package = "xous-api-susres", version = "0.9.53" }
|
susres = { package = "xous-api-susres", version = "0.9.53" }
|
||||||
codec = { path = "../codec" }
|
codec = { path = "../codec" }
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
aes = { path = "../aes" }
|
aes = { path = "../aes" }
|
||||||
cipher = "0.3.0"
|
cipher = "0.3.0"
|
||||||
|
|
@ -113,9 +113,9 @@ default-features = false
|
||||||
features = ["u32_backend", "rand"]
|
features = ["u32_backend", "rand"]
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor", "sha2/precursor"]
|
||||||
hosted = ["utralib/hosted", "random-pick"]
|
hosted = ["utralib/hosted", "sha2/hosted", "random-pick"]
|
||||||
renode = ["utralib/renode"]
|
renode = ["utralib/renode", "sha2/renode"]
|
||||||
debugprint = []
|
debugprint = []
|
||||||
spinortest = [
|
spinortest = [
|
||||||
] # for spinor testing. contra-indicated with PDDB, as it steals memory from the PDDB.
|
] # for spinor testing. contra-indicated with PDDB, as it steals memory from the PDDB.
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ rkyv = { version = "0.4.3", default-features = false, features = [
|
||||||
chrono = { version = "0.4.19", default-features = false, features = ["std"] }
|
chrono = { version = "0.4.19", default-features = false, features = ["std"] }
|
||||||
crossbeam = "0.8.2"
|
crossbeam = "0.8.2"
|
||||||
|
|
||||||
sha2 = { version = "0.10.8", features = ["precursor"] }
|
sha2 = { version = "0.10.8" }
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
xous-semver = "0.1.2"
|
xous-semver = "0.1.2"
|
||||||
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
|
com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" }
|
||||||
|
|
@ -54,11 +54,11 @@ utralib = { version = "0.1.24", optional = true, default-features = false }
|
||||||
chrono = "0.4.19"
|
chrono = "0.4.19"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor", "sha2/precursor"]
|
||||||
hosted = ["utralib/hosted"]
|
hosted = ["utralib/hosted", "sha2/hosted"]
|
||||||
renode = ["utralib/renode"]
|
renode = ["utralib/renode", "sha2/renode"]
|
||||||
debugprint = []
|
debugprint = []
|
||||||
braille = [] # used for braille mode, so console isn't overwhelmed with status
|
braille = [] # used for braille mode, so console isn't overwhelmed with status
|
||||||
tts = []
|
tts = []
|
||||||
# default = ["debugprint"] # "debugprint"
|
# default = ["debugprint"] # "debugprint"
|
||||||
dbg-ecupdate = []
|
dbg-ecupdate = []
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue