mirror of
https://gitlab.com/veilid/veilid.git
synced 2024-10-01 01:26:08 -04:00
upgrade dependencies and fix cargo locks
This commit is contained in:
John Smith
parent
73688014e6
commit
89b357350d
592
Cargo.lock
generated
592
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -37,60 +37,60 @@ network-result-extra = ["veilid-tools/network-result-extra"]
|
||||
|
||||
# Tools
|
||||
veilid-tools = { path = "../veilid-tools", features = [ "tracing" ] }
|
||||
paste = "1.0.12"
|
||||
once_cell = "^1"
|
||||
owning_ref = "^0"
|
||||
backtrace = { version = "^0" }
|
||||
paste = "1.0.14"
|
||||
once_cell = "1.18.0"
|
||||
owning_ref = "0.4.1"
|
||||
backtrace = "0.3.68"
|
||||
num-traits = "0.2.15"
|
||||
shell-words = "1.1.0"
|
||||
static_assertions = "^1"
|
||||
cfg-if = "^1"
|
||||
hex = "^0"
|
||||
lazy_static = "^1"
|
||||
directories = "^4"
|
||||
static_assertions = "1.1.0"
|
||||
cfg-if = "1.0.0"
|
||||
hex = "0.4.3"
|
||||
lazy_static = "1.4.0"
|
||||
directories = "5.0.1"
|
||||
|
||||
# Logging
|
||||
tracing = { version = "^0", features = ["log", "attributes"] }
|
||||
tracing-subscriber = "^0"
|
||||
tracing-error = "^0"
|
||||
eyre = "^0"
|
||||
thiserror = "^1"
|
||||
tracing = { version = "0.1.37", features = ["log", "attributes"] }
|
||||
tracing-subscriber = "0.3.17"
|
||||
tracing-error = "0.2.0"
|
||||
eyre = "0.6.8"
|
||||
thiserror = "1.0.47"
|
||||
|
||||
# Data structures
|
||||
enumset = { version= "^1", features = ["serde"] }
|
||||
enumset = { version= "1.1.2", features = ["serde"] }
|
||||
keyvaluedb = { path = "../external/keyvaluedb/keyvaluedb" }
|
||||
range-set-blaze = "0.1.5"
|
||||
range-set-blaze = "0.1.9"
|
||||
weak-table = "0.3.2"
|
||||
generic-array = "^0"
|
||||
generic-array = "0.14.7"
|
||||
hashlink = { path = "../external/hashlink", features = ["serde_impl"] }
|
||||
|
||||
# System
|
||||
futures-util = { version = "^0", default_features = false, features = ["alloc"] }
|
||||
flume = { version = "^0", features = ["async"] }
|
||||
parking_lot = "^0"
|
||||
stop-token = { version = "^0", default-features = false }
|
||||
futures-util = { version = "0.3.28", default_features = false, features = ["alloc"] }
|
||||
flume = { version = "0.11.0", features = ["async"] }
|
||||
parking_lot = "0.12.1"
|
||||
stop-token = { version = "0.7.0", default-features = false }
|
||||
|
||||
# Crypto
|
||||
ed25519-dalek = { version = "^1", default_features = false, features = ["alloc", "u64_backend"] }
|
||||
x25519-dalek = { version = "^1", default_features = false, features = ["u64_backend"] }
|
||||
curve25519-dalek = { version = "^3", default_features = false, features = ["alloc", "u64_backend"] }
|
||||
blake3 = { version = "^1" }
|
||||
chacha20poly1305 = "^0"
|
||||
chacha20 = "^0"
|
||||
argon2 = "0.5.0"
|
||||
ed25519-dalek = { version = "2.0.0", default_features = false, features = ["alloc", "rand_core", "digest"] }
|
||||
x25519-dalek = { version = "2.0.0", default_features = false, features = ["alloc", "static_secrets"] }
|
||||
curve25519-dalek = { version = "4.0.0", default_features = false, features = ["alloc"] }
|
||||
blake3 = { version = "1.4.1" }
|
||||
chacha20poly1305 = "0.10.1"
|
||||
chacha20 = "0.9.1"
|
||||
argon2 = "0.5.1"
|
||||
|
||||
# Network
|
||||
async-std-resolver = { version = "^0", optional = true }
|
||||
trust-dns-resolver = { version = "^0", optional = true }
|
||||
async-std-resolver = { version = "0.22.0", optional = true }
|
||||
trust-dns-resolver = { version = "0.22.0", optional = true }
|
||||
enum-as-inner = "=0.5.1" # temporary fix for trust-dns-resolver v0.22.0
|
||||
|
||||
# Serialization
|
||||
capnp = { version = "^0", default_features = false }
|
||||
serde = { version = "^1", features = ["derive" ] }
|
||||
serde_json = { version = "^1" }
|
||||
serde-big-array = "^0"
|
||||
json = "^0"
|
||||
data-encoding = { version = "^2" }
|
||||
capnp = { version = "0.17.2", default_features = false }
|
||||
serde = { version = "1.0.183", features = ["derive" ] }
|
||||
serde_json = { version = "1.0.105" }
|
||||
serde-big-array = "0.5.1"
|
||||
json = "0.12.4"
|
||||
data-encoding = { version = "2.4.0" }
|
||||
schemars = "0.8.12"
|
||||
lz4_flex = { version = "0.11.1", default-features = false, features = ["safe-encode", "safe-decode"] }
|
||||
|
||||
@ -99,61 +99,61 @@ lz4_flex = { version = "0.11.1", default-features = false, features = ["safe-enc
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
|
||||
# Tools
|
||||
config = { version = "^0", features = ["yaml"] }
|
||||
config = { version = "0.13.3", features = ["yaml"] }
|
||||
bugsalot = { git = "https://github.com/crioux/bugsalot.git" }
|
||||
chrono = "^0"
|
||||
libc = "^0"
|
||||
nix = "^0"
|
||||
chrono = "0.4.26"
|
||||
libc = "0.2.147"
|
||||
nix = "0.26.2"
|
||||
|
||||
# System
|
||||
async-std = { version = "^1", features = ["unstable"], optional = true}
|
||||
tokio = { version = "^1", features = ["full"], optional = true}
|
||||
tokio-util = { version = "^0", features = ["compat"], optional = true}
|
||||
tokio-stream = { version = "^0", features = ["net"], optional = true}
|
||||
async-io = { version = "^1" }
|
||||
futures-util = { version = "^0", default-features = false, features = ["async-await", "sink", "std", "io"] }
|
||||
async-std = { version = "1.12.0", features = ["unstable"], optional = true}
|
||||
tokio = { version = "1.32.0", features = ["full"], optional = true}
|
||||
tokio-util = { version = "0.7.8", features = ["compat"], optional = true}
|
||||
tokio-stream = { version = "0.1.14", features = ["net"], optional = true}
|
||||
async-io = { version = "1.13.0" }
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["async-await", "sink", "std", "io"] }
|
||||
|
||||
# Data structures
|
||||
keyring-manager = { path = "../external/keyring-manager" }
|
||||
keyvaluedb-sqlite = { path = "../external/keyvaluedb/keyvaluedb-sqlite" }
|
||||
|
||||
# Network
|
||||
async-tungstenite = { version = "^0", features = ["async-tls"] }
|
||||
async-tungstenite = { version = "0.23.0", features = ["async-tls"] }
|
||||
igd = { path = "../external/rust-igd" }
|
||||
async-tls = "^0.11"
|
||||
webpki = "^0"
|
||||
webpki-roots = "^0"
|
||||
rustls = "^0.19"
|
||||
rustls-pemfile = "^0.2"
|
||||
socket2 = { version = "^0", features = ["all"] }
|
||||
async-tls = "0.12.0"
|
||||
webpki = "0.22.0"
|
||||
webpki-roots = "0.25.2"
|
||||
rustls = "0.20.8"
|
||||
rustls-pemfile = "1.0.3"
|
||||
socket2 = { version = "0.5.3", features = ["all"] }
|
||||
|
||||
# Dependencies for WASM builds only
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
|
||||
# Tools
|
||||
getrandom = { version = "^0", features = ["js"] }
|
||||
getrandom = { version = "0.2.4", features = ["js"] }
|
||||
|
||||
# System
|
||||
async_executors = { version = "^0", default-features = false, features = [ "bindgen", "timer" ]}
|
||||
async-lock = "^2"
|
||||
wasm-bindgen = "^0"
|
||||
js-sys = "^0"
|
||||
wasm-bindgen-futures = "^0"
|
||||
send_wrapper = { version = "^0", features = ["futures"] }
|
||||
async_executors = { version = "0.7.0", default-features = false, features = [ "bindgen", "timer" ]}
|
||||
async-lock = "2.8.0"
|
||||
wasm-bindgen = "0.2.87"
|
||||
js-sys = "0.3.64"
|
||||
wasm-bindgen-futures = "0.4.37"
|
||||
send_wrapper = { version = "0.6.0", features = ["futures"] }
|
||||
|
||||
# Network
|
||||
ws_stream_wasm = "^0"
|
||||
ws_stream_wasm = "0.7.4"
|
||||
|
||||
# Logging
|
||||
wasm-logger = "^0"
|
||||
tracing-wasm = "^0"
|
||||
wasm-logger = "0.2.0"
|
||||
tracing-wasm = "0.2.1"
|
||||
|
||||
# Data Structures
|
||||
keyvaluedb-web = { path = "../external/keyvaluedb/keyvaluedb-web" }
|
||||
|
||||
### Configuration for WASM32 'web-sys' crate
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies.web-sys]
|
||||
version = "^0"
|
||||
version = "0.3.64"
|
||||
features = [
|
||||
'Document',
|
||||
'HtmlDocument',
|
||||
@ -169,15 +169,15 @@ features = [
|
||||
|
||||
# Dependencies for Android
|
||||
[target.'cfg(target_os = "android")'.dependencies]
|
||||
jni = "^0"
|
||||
jni-sys = "^0"
|
||||
ndk = { version = "^0.7" }
|
||||
ndk-glue = { version = "^0.7", features = ["logger"] }
|
||||
paranoid-android = { version = "^0", optional = true }
|
||||
jni = "0.21.1"
|
||||
jni-sys = "0.3.0"
|
||||
ndk = { version = "0.7.0" }
|
||||
ndk-glue = { version = "0.7.0", features = ["logger"] }
|
||||
paranoid-android = { version = "0.2.1", optional = true }
|
||||
|
||||
# Dependenices for all Unix (Linux, Android, MacOS, iOS)
|
||||
[target.'cfg(unix)'.dependencies]
|
||||
ifstructs = "^0"
|
||||
ifstructs = "0.1.1"
|
||||
|
||||
# Dependencies for Linux or Android
|
||||
[target.'cfg(any(target_os = "android", target_os = "linux"))'.dependencies]
|
||||
@ -187,38 +187,38 @@ netlink-packet-route = { version = "=0.17.0" }
|
||||
|
||||
# Dependencies for Windows
|
||||
[target.'cfg(target_os = "windows")'.dependencies]
|
||||
winapi = { version = "^0", features = [ "iptypes", "iphlpapi" ] }
|
||||
windows = { version = "^0", features = [ "Win32_NetworkManagement_Dns", "Win32_Foundation", "alloc" ]}
|
||||
windows-permissions = "^0"
|
||||
winapi = { version = "0.3.9", features = [ "iptypes", "iphlpapi" ] }
|
||||
windows = { version = "0.51.1", features = [ "Win32_NetworkManagement_Dns", "Win32_Foundation" ]}
|
||||
windows-permissions = "0.2.4"
|
||||
|
||||
# Dependencies for iOS
|
||||
[target.'cfg(target_os = "ios")'.dependencies]
|
||||
tracing-oslog = { version = "^0", optional = true }
|
||||
tracing-oslog = { version = "0.1.2", optional = true }
|
||||
|
||||
# Rusqlite configuration to ensure platforms that don't come with sqlite get it bundled
|
||||
# Except WASM which doesn't use sqlite
|
||||
[target.'cfg(all(not(target_os = "ios"),not(target_os = "android"),not(target_arch = "wasm32")))'.dependencies.rusqlite]
|
||||
version = "^0"
|
||||
version = "0.29.0"
|
||||
features = ["bundled"]
|
||||
|
||||
### DEV DEPENDENCIES
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "^0"
|
||||
serial_test = "2.0.0"
|
||||
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
|
||||
simplelog = { version = "^0", features=["test"] }
|
||||
simplelog = { version = "0.12.1", features=["test"] }
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
|
||||
wasm-bindgen-test = "^0"
|
||||
console_error_panic_hook = "^0"
|
||||
wee_alloc = "^0"
|
||||
wasm-logger = "^0"
|
||||
wasm-bindgen-test = "0.3.37"
|
||||
console_error_panic_hook = "0.1.7"
|
||||
wee_alloc = "0.4.5"
|
||||
wasm-logger = "0.2.0"
|
||||
|
||||
### BUILD OPTIONS
|
||||
|
||||
[build-dependencies]
|
||||
capnpc = "^0"
|
||||
capnpc = "0.17.2"
|
||||
|
||||
[package.metadata.wasm-pack.profile.release]
|
||||
wasm-opt = ["-O", "--enable-mutable-globals"]
|
||||
|
||||
@ -1,29 +1,66 @@
|
||||
use curve25519_dalek::digest::generic_array::typenum::U64;
|
||||
use curve25519_dalek::digest::{Digest, Output};
|
||||
use curve25519_dalek::digest::{
|
||||
Digest, FixedOutput, FixedOutputReset, Output, OutputSizeUser, Reset, Update,
|
||||
};
|
||||
use generic_array::GenericArray;
|
||||
|
||||
pub struct Blake3Digest512 {
|
||||
dig: blake3::Hasher,
|
||||
}
|
||||
|
||||
impl Digest for Blake3Digest512 {
|
||||
impl OutputSizeUser for Blake3Digest512 {
|
||||
type OutputSize = U64;
|
||||
}
|
||||
|
||||
impl Update for Blake3Digest512 {
|
||||
fn update(&mut self, data: &[u8]) {
|
||||
self.dig.update(data);
|
||||
}
|
||||
}
|
||||
|
||||
impl FixedOutput for Blake3Digest512 {
|
||||
fn finalize_into(self, out: &mut Output<Self>) {
|
||||
let mut b = [0u8; 64];
|
||||
self.dig.finalize_xof().fill(&mut b);
|
||||
for n in 0..64 {
|
||||
out[n] = b[n];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Reset for Blake3Digest512 {
|
||||
fn reset(&mut self) {
|
||||
self.dig.reset();
|
||||
}
|
||||
}
|
||||
|
||||
impl FixedOutputReset for Blake3Digest512 {
|
||||
fn finalize_into_reset(&mut self, out: &mut Output<Self>) {
|
||||
let mut b = [0u8; 64];
|
||||
self.dig.finalize_xof().fill(&mut b);
|
||||
for n in 0..64 {
|
||||
out[n] = b[n];
|
||||
}
|
||||
self.dig.reset();
|
||||
}
|
||||
}
|
||||
|
||||
impl Digest for Blake3Digest512 {
|
||||
fn new() -> Self {
|
||||
Self {
|
||||
dig: blake3::Hasher::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn update(&mut self, data: impl AsRef<[u8]>) {
|
||||
self.dig.update(data.as_ref());
|
||||
fn new_with_prefix(data: impl AsRef<[u8]>) -> Self {
|
||||
Self::new().chain_update(data)
|
||||
}
|
||||
|
||||
fn chain(mut self, data: impl AsRef<[u8]>) -> Self
|
||||
fn chain_update(mut self, data: impl AsRef<[u8]>) -> Self
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
self.update(data);
|
||||
<Self as Update>::update(&mut self, data.as_ref());
|
||||
self
|
||||
}
|
||||
|
||||
@ -44,21 +81,17 @@ impl Digest for Blake3Digest512 {
|
||||
for n in 0..64 {
|
||||
out[n] = b[n];
|
||||
}
|
||||
self.reset();
|
||||
out
|
||||
}
|
||||
|
||||
fn reset(&mut self) {
|
||||
self.dig.reset();
|
||||
out
|
||||
}
|
||||
|
||||
fn output_size() -> usize {
|
||||
64
|
||||
}
|
||||
|
||||
fn digest(data: &[u8]) -> Output<Self> {
|
||||
fn digest(data: impl AsRef<[u8]>) -> Output<Self> {
|
||||
let mut dig = blake3::Hasher::new();
|
||||
dig.update(data);
|
||||
dig.update(data.as_ref());
|
||||
let mut b = [0u8; 64];
|
||||
dig.finalize_xof().fill(&mut b);
|
||||
let mut out = GenericArray::<u8, U64>::default();
|
||||
@ -67,4 +100,26 @@ impl Digest for Blake3Digest512 {
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn update(&mut self, data: impl AsRef<[u8]>) {
|
||||
<Self as Update>::update(self, data.as_ref())
|
||||
}
|
||||
|
||||
fn finalize_into(self, out: &mut Output<Self>) {
|
||||
<Self as FixedOutput>::finalize_into(self, out)
|
||||
}
|
||||
|
||||
fn finalize_into_reset(&mut self, out: &mut Output<Self>)
|
||||
where
|
||||
Self: FixedOutputReset,
|
||||
{
|
||||
<Self as FixedOutputReset>::finalize_into_reset(self, out)
|
||||
}
|
||||
|
||||
fn reset(&mut self)
|
||||
where
|
||||
Self: Reset,
|
||||
{
|
||||
<Self as Reset>::reset(self);
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,9 +7,9 @@ use argon2::{
|
||||
use chacha20::cipher::{KeyIvInit, StreamCipher};
|
||||
use chacha20::XChaCha20;
|
||||
use chacha20poly1305 as ch;
|
||||
use chacha20poly1305::aead::{AeadInPlace, NewAead};
|
||||
use chacha20poly1305::aead::AeadInPlace;
|
||||
use chacha20poly1305::KeyInit;
|
||||
use core::convert::TryInto;
|
||||
use curve25519_dalek as cd;
|
||||
use curve25519_dalek::digest::Digest;
|
||||
use ed25519_dalek as ed;
|
||||
use x25519_dalek as xd;
|
||||
@ -17,27 +17,27 @@ use x25519_dalek as xd;
|
||||
const AEAD_OVERHEAD: usize = 16;
|
||||
pub const CRYPTO_KIND_VLD0: CryptoKind = FourCC(*b"VLD0");
|
||||
|
||||
fn ed25519_to_x25519_pk(key: &ed::PublicKey) -> VeilidAPIResult<xd::PublicKey> {
|
||||
let bytes = key.to_bytes();
|
||||
let compressed = cd::edwards::CompressedEdwardsY(bytes);
|
||||
let point = compressed
|
||||
.decompress()
|
||||
.ok_or_else(|| VeilidAPIError::internal("ed25519_to_x25519_pk failed"))?;
|
||||
let mp = point.to_montgomery();
|
||||
fn ed25519_to_x25519_pk(key: &ed::VerifyingKey) -> VeilidAPIResult<xd::PublicKey> {
|
||||
let mp = key.to_montgomery();
|
||||
Ok(xd::PublicKey::from(mp.to_bytes()))
|
||||
}
|
||||
fn ed25519_to_x25519_sk(key: &ed::SecretKey) -> VeilidAPIResult<xd::StaticSecret> {
|
||||
let exp = ed::ExpandedSecretKey::from(key);
|
||||
let bytes: [u8; ed::EXPANDED_SECRET_KEY_LENGTH] = exp.to_bytes();
|
||||
let lowbytes: [u8; 32] = bytes[0..32].try_into().map_err(VeilidAPIError::internal)?;
|
||||
Ok(xd::StaticSecret::from(lowbytes))
|
||||
fn ed25519_to_x25519_sk(key: &ed::SigningKey) -> VeilidAPIResult<xd::StaticSecret> {
|
||||
Ok(xd::StaticSecret::from(*key.to_scalar().as_bytes()))
|
||||
}
|
||||
|
||||
pub fn vld0_generate_keypair() -> KeyPair {
|
||||
let mut csprng = VeilidRng {};
|
||||
let keypair = ed::Keypair::generate(&mut csprng);
|
||||
let dht_key = PublicKey::new(keypair.public.to_bytes());
|
||||
let dht_key_secret = SecretKey::new(keypair.secret.to_bytes());
|
||||
let keypair = ed::SigningKey::generate(&mut csprng);
|
||||
let dht_key = PublicKey::new(
|
||||
keypair.to_keypair_bytes()[ed::SECRET_KEY_LENGTH..]
|
||||
.try_into()
|
||||
.expect("should fit"),
|
||||
);
|
||||
let dht_key_secret = SecretKey::new(
|
||||
keypair.to_keypair_bytes()[0..ed::SECRET_KEY_LENGTH]
|
||||
.try_into()
|
||||
.expect("should fit"),
|
||||
);
|
||||
|
||||
KeyPair::new(dht_key, dht_key_secret)
|
||||
}
|
||||
@ -130,9 +130,9 @@ impl CryptoSystem for CryptoSystemVLD0 {
|
||||
SharedSecret::new(s)
|
||||
}
|
||||
fn compute_dh(&self, key: &PublicKey, secret: &SecretKey) -> VeilidAPIResult<SharedSecret> {
|
||||
let pk_ed = ed::PublicKey::from_bytes(&key.bytes).map_err(VeilidAPIError::internal)?;
|
||||
let pk_ed = ed::VerifyingKey::from_bytes(&key.bytes).map_err(VeilidAPIError::internal)?;
|
||||
let pk_xd = ed25519_to_x25519_pk(&pk_ed)?;
|
||||
let sk_ed = ed::SecretKey::from_bytes(&secret.bytes).map_err(VeilidAPIError::internal)?;
|
||||
let sk_ed = ed::SigningKey::from_bytes(&secret.bytes);
|
||||
let sk_xd = ed25519_to_x25519_sk(&sk_ed)?;
|
||||
Ok(SharedSecret::new(sk_xd.diffie_hellman(&pk_xd).to_bytes()))
|
||||
}
|
||||
@ -197,7 +197,7 @@ impl CryptoSystem for CryptoSystemVLD0 {
|
||||
|
||||
kpb[..SECRET_KEY_LENGTH].copy_from_slice(&dht_key_secret.bytes);
|
||||
kpb[SECRET_KEY_LENGTH..].copy_from_slice(&dht_key.bytes);
|
||||
let keypair = ed::Keypair::from_bytes(&kpb)
|
||||
let keypair = ed::SigningKey::from_keypair_bytes(&kpb)
|
||||
.map_err(|e| VeilidAPIError::parse_error("Keypair is invalid", e))?;
|
||||
|
||||
let mut dig = Blake3Digest512::new();
|
||||
@ -219,11 +219,9 @@ impl CryptoSystem for CryptoSystemVLD0 {
|
||||
data: &[u8],
|
||||
signature: &Signature,
|
||||
) -> VeilidAPIResult<()> {
|
||||
let pk = ed::PublicKey::from_bytes(&dht_key.bytes)
|
||||
let pk = ed::VerifyingKey::from_bytes(&dht_key.bytes)
|
||||
.map_err(|e| VeilidAPIError::parse_error("Public key is invalid", e))?;
|
||||
let sig = ed::Signature::from_bytes(&signature.bytes)
|
||||
.map_err(|e| VeilidAPIError::parse_error("Signature is invalid", e))?;
|
||||
|
||||
let sig = ed::Signature::from_bytes(&signature.bytes);
|
||||
let mut dig = Blake3Digest512::new();
|
||||
dig.update(data);
|
||||
|
||||
@ -302,7 +300,7 @@ impl CryptoSystem for CryptoSystemVLD0 {
|
||||
nonce: &[u8; NONCE_LENGTH],
|
||||
shared_secret: &SharedSecret,
|
||||
) {
|
||||
let mut cipher = XChaCha20::new(&shared_secret.bytes.into(), nonce.into());
|
||||
let mut cipher = <XChaCha20 as KeyIvInit>::new(&shared_secret.bytes.into(), nonce.into());
|
||||
cipher.apply_keystream(body);
|
||||
}
|
||||
|
||||
@ -313,7 +311,7 @@ impl CryptoSystem for CryptoSystemVLD0 {
|
||||
nonce: &[u8; NONCE_LENGTH],
|
||||
shared_secret: &SharedSecret,
|
||||
) {
|
||||
let mut cipher = XChaCha20::new(&shared_secret.bytes.into(), nonce.into());
|
||||
let mut cipher = <XChaCha20 as KeyIvInit>::new(&shared_secret.bytes.into(), nonce.into());
|
||||
cipher.apply_keystream_b2b(in_buf, out_buf).unwrap();
|
||||
}
|
||||
|
||||
|
||||
@ -17,12 +17,10 @@ pub use protocol::*;
|
||||
|
||||
use async_tls::TlsAcceptor;
|
||||
use futures_util::StreamExt;
|
||||
use std::io;
|
||||
// xxx: rustls ^0.20
|
||||
//use rustls::{server::NoClientAuth, Certificate, PrivateKey, ServerConfig};
|
||||
use rustls::{Certificate, NoClientAuth, PrivateKey, ServerConfig};
|
||||
use rustls::{Certificate, PrivateKey, ServerConfig};
|
||||
use rustls_pemfile::{certs, pkcs8_private_keys, rsa_private_keys};
|
||||
use std::fs::File;
|
||||
use std::io;
|
||||
use std::io::BufReader;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
@ -295,15 +293,10 @@ impl Network {
|
||||
return Err(io::Error::new(io::ErrorKind::InvalidInput, format!("Private key at {} could not be loaded.\nEnsure it is unencrypted and in RSA or PKCS8 format, beginning with '-----BEGIN RSA PRIVATE KEY-----' or '-----BEGIN PRIVATE KEY-----'",c.network.tls.private_key_path)));
|
||||
}
|
||||
|
||||
// xxx: rustls ^0.20
|
||||
// let mut config = ServerConfig::builder()
|
||||
// .with_safe_defaults()
|
||||
// .with_no_client_auth()
|
||||
// .with_single_cert(certs, keys.remove(0))
|
||||
// .map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
|
||||
let mut config = ServerConfig::new(NoClientAuth::new());
|
||||
config
|
||||
.set_single_cert(certs, keys.remove(0))
|
||||
let config = ServerConfig::builder()
|
||||
.with_safe_defaults()
|
||||
.with_no_client_auth()
|
||||
.with_single_cert(certs, keys.remove(0))
|
||||
.map_err(|err| io::Error::new(io::ErrorKind::InvalidInput, err))?;
|
||||
|
||||
Ok(config)
|
||||
|
||||
@ -22,54 +22,54 @@ network-result-extra = []
|
||||
network-result-info = []
|
||||
|
||||
[dependencies]
|
||||
tracing = { version = "^0", features = ["log", "attributes"], optional = true }
|
||||
tracing-subscriber = { version = "^0", optional = true }
|
||||
log = { version = "^0" }
|
||||
eyre = "^0"
|
||||
static_assertions = "^1"
|
||||
cfg-if = "^1"
|
||||
thiserror = "^1"
|
||||
futures-util = { version = "^0", default_features = false, features = ["alloc"] }
|
||||
parking_lot = "^0"
|
||||
once_cell = "^1"
|
||||
stop-token = { version = "^0", default-features = false }
|
||||
rand = "^0.7"
|
||||
rust-fsm = "^0"
|
||||
backtrace = "^0"
|
||||
fn_name = "^0"
|
||||
range-set-blaze = "0.1.5"
|
||||
flume = { version = "^0", features = ["async"] }
|
||||
tracing = { version = "0.1.37", features = ["log", "attributes"], optional = true }
|
||||
tracing-subscriber = { version = "0.3.17", optional = true }
|
||||
log = { version = "0.4.20" }
|
||||
eyre = "0.6.8"
|
||||
static_assertions = "1.1.0"
|
||||
cfg-if = "1.0.0"
|
||||
thiserror = "1.0.47"
|
||||
futures-util = { version = "0.3.28", default_features = false, features = ["alloc"] }
|
||||
parking_lot = "0.12.1"
|
||||
once_cell = "1.18.0"
|
||||
stop-token = { version = "0.7.0", default-features = false }
|
||||
rand = "0.8.5"
|
||||
rand_core = "0.6.4"
|
||||
backtrace = "0.3.68"
|
||||
fn_name = "0.1.0"
|
||||
range-set-blaze = "0.1.9"
|
||||
flume = { version = "0.11.0", features = ["async"] }
|
||||
|
||||
# Dependencies for native builds only
|
||||
# Linux, Windows, Mac, iOS, Android
|
||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||
async-std = { version = "^1", features = ["unstable"], optional = true}
|
||||
tokio = { version = "^1", features = ["full"], optional = true}
|
||||
tokio-util = { version = "^0", features = ["compat"], optional = true}
|
||||
futures-util = { version = "^0", default-features = false, features = ["async-await", "sink", "std", "io"] }
|
||||
chrono = "^0"
|
||||
async-std = { version = "1.12.0", features = ["unstable"], optional = true}
|
||||
tokio = { version = "1.32.0", features = ["full"], optional = true}
|
||||
tokio-util = { version = "0.7.8", features = ["compat"], optional = true}
|
||||
futures-util = { version = "0.3.28", default-features = false, features = ["async-await", "sink", "std", "io"] }
|
||||
chrono = "0.4.26"
|
||||
|
||||
libc = "^0"
|
||||
nix = "^0"
|
||||
libc = "0.2.147"
|
||||
nix = "0.26.2"
|
||||
|
||||
# Dependencies for WASM builds only
|
||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||
wasm-bindgen = "^0"
|
||||
js-sys = "^0"
|
||||
wasm-bindgen-futures = "^0"
|
||||
async_executors = { version = "^0", default-features = false}
|
||||
async-lock = "^2"
|
||||
send_wrapper = { version = "^0.6", features = ["futures"] }
|
||||
wasm-bindgen = "0.2.87"
|
||||
js-sys = "0.3.64"
|
||||
wasm-bindgen-futures = "0.4.37"
|
||||
async_executors = { version = "0.7.0", default-features = false}
|
||||
async-lock = "2.8.0"
|
||||
send_wrapper = { version = "0.6.0", features = ["futures"] }
|
||||
|
||||
# Dependencies for Android
|
||||
[target.'cfg(target_os = "android")'.dependencies]
|
||||
jni = "^0"
|
||||
jni-sys = "^0"
|
||||
ndk = { version = "^0.7" }
|
||||
ndk-glue = { version = "^0.7", features = ["logger"] }
|
||||
lazy_static = "^1.4.0"
|
||||
paranoid-android = { version = "^0", optional = true }
|
||||
android-logd-logger = "0.2.1"
|
||||
jni = "0.21.1"
|
||||
jni-sys = "0.3.0"
|
||||
ndk = { version = "0.7.0" }
|
||||
ndk-glue = { version = "0.7.0", features = ["logger"] }
|
||||
lazy_static = "1.4.0"
|
||||
paranoid-android = { version = "0.2.1", optional = true }
|
||||
android-logd-logger = "0.4.2"
|
||||
|
||||
# Dependencies for Windows
|
||||
# [target.'cfg(target_os = "windows")'.dependencies]
|
||||
@ -78,22 +78,21 @@ android-logd-logger = "0.2.1"
|
||||
|
||||
# Dependencies for iOS
|
||||
[target.'cfg(target_os = "ios")'.dependencies]
|
||||
oslog = { version = "^0", optional = true }
|
||||
tracing-oslog = { version = "^0", optional = true }
|
||||
oslog = { version = "0.2.0", optional = true }
|
||||
tracing-oslog = { version = "0.1.2", optional = true }
|
||||
|
||||
### DEV DEPENDENCIES
|
||||
|
||||
[dev-dependencies]
|
||||
serial_test = "^0"
|
||||
simplelog = { version = "^0.12", features = [ "test" ] }
|
||||
serial_test = "^2.0.0"
|
||||
simplelog = { version = "0.12.1", features = [ "test" ] }
|
||||
|
||||
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
|
||||
console_error_panic_hook = "^0"
|
||||
wasm-bindgen-test = "^0"
|
||||
wee_alloc = "^0"
|
||||
wasm-logger = "^0"
|
||||
tracing-wasm = { version = "^0" }
|
||||
parking_lot = { version = "^0", features = ["wasm-bindgen"]}
|
||||
console_error_panic_hook = "0.1.7"
|
||||
wasm-bindgen-test = "0.3.37"
|
||||
wee_alloc = "0.4.5"
|
||||
wasm-logger = "0.2.0"
|
||||
tracing-wasm = { version = "0.2.1" }
|
||||
|
||||
### BUILD OPTIONS
|
||||
|
||||
|
||||
@ -1,102 +0,0 @@
|
||||
use super::*;
|
||||
pub use rust_fsm;
|
||||
pub use rust_fsm::*;
|
||||
|
||||
pub type StateChangeCallback<T> = Arc<
|
||||
dyn Fn(<T as StateMachineImpl>::State, <T as StateMachineImpl>::State) + Send + Sync + 'static,
|
||||
>;
|
||||
|
||||
struct CallbackStateMachineInner<T>
|
||||
where
|
||||
T: StateMachineImpl,
|
||||
T::State: Copy + Unpin + core::fmt::Debug,
|
||||
{
|
||||
state: T::State,
|
||||
callback: Option<StateChangeCallback<T>>,
|
||||
eventual: EventualValueClone<T::State>,
|
||||
}
|
||||
|
||||
impl<T> core::fmt::Debug for CallbackStateMachineInner<T>
|
||||
where
|
||||
T: StateMachineImpl,
|
||||
T::State: Copy + Unpin + core::fmt::Debug,
|
||||
{
|
||||
fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
|
||||
write!(f, "CallbackStateMachineInner(state: {:?})", self.state)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct CallbackStateMachine<T>
|
||||
where
|
||||
T: StateMachineImpl,
|
||||
T::State: Copy + Unpin + core::fmt::Debug,
|
||||
{
|
||||
inner: Arc<Mutex<CallbackStateMachineInner<T>>>,
|
||||
}
|
||||
|
||||
impl<T> CallbackStateMachine<T>
|
||||
where
|
||||
T: StateMachineImpl,
|
||||
T::State: Copy + Unpin + core::fmt::Debug,
|
||||
{
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
inner: Arc::new(Mutex::new(CallbackStateMachineInner {
|
||||
state: T::INITIAL_STATE,
|
||||
callback: None,
|
||||
eventual: EventualValueClone::new(),
|
||||
})),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_state_change_callback(&self, callback: StateChangeCallback<T>) {
|
||||
self.inner.lock().callback = Some(callback);
|
||||
}
|
||||
|
||||
pub fn clear_state_change_callback(&self) {
|
||||
self.inner.lock().callback = None;
|
||||
}
|
||||
|
||||
pub fn state_eventual_instance(&self) -> (T::State, EventualValueCloneFuture<T::State>) {
|
||||
let inner = self.inner.lock();
|
||||
(inner.state, inner.eventual.instance())
|
||||
}
|
||||
|
||||
pub async fn consume(&self, input: &T::Input) -> Result<Option<T::Output>, ()> {
|
||||
let current_state = self.inner.lock().state;
|
||||
|
||||
if let Some(new_state) = T::transition(¤t_state, input) {
|
||||
let output = T::output(¤t_state, input);
|
||||
let old_state = current_state;
|
||||
let (callback, eventual) = {
|
||||
let mut inner = self.inner.lock();
|
||||
inner.state = new_state;
|
||||
let eventual =
|
||||
core::mem::replace(&mut inner.eventual, EventualValueClone::<T::State>::new());
|
||||
(inner.callback.clone(), eventual)
|
||||
};
|
||||
if let Some(cb) = callback {
|
||||
cb(old_state, new_state);
|
||||
}
|
||||
eventual.resolve(new_state).await;
|
||||
Ok(output)
|
||||
} else {
|
||||
Err(())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn state(&self) -> T::State {
|
||||
self.inner.lock().state
|
||||
}
|
||||
}
|
||||
|
||||
impl<T> Default for CallbackStateMachine<T>
|
||||
where
|
||||
T: StateMachineImpl,
|
||||
T::State: Copy + Unpin + core::fmt::Debug,
|
||||
{
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,6 @@
|
||||
mod assembly_buffer;
|
||||
mod async_peek_stream;
|
||||
mod async_tag_lock;
|
||||
mod callback_state_machine;
|
||||
mod clone_stream;
|
||||
mod eventual;
|
||||
mod eventual_base;
|
||||
@ -92,7 +91,6 @@ cfg_if! {
|
||||
pub use assembly_buffer::*;
|
||||
pub use async_peek_stream::*;
|
||||
pub use async_tag_lock::*;
|
||||
pub use callback_state_machine::*;
|
||||
pub use clone_stream::*;
|
||||
pub use eventual::*;
|
||||
pub use eventual_base::{EventualCommon, EventualResolvedFuture};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user