mirror of
https://github.com/rosenpass/rosenpass.git
synced 2025-12-18 21:34:37 +03:00
Compare commits
1 Commits
dev/karo/a
...
revert-431
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6401ed6cfb |
20
Cargo.toml
20
Cargo.toml
@@ -32,7 +32,7 @@ rosenpass-secret-memory = { path = "secret-memory" }
|
|||||||
rosenpass-oqs = { path = "oqs" }
|
rosenpass-oqs = { path = "oqs" }
|
||||||
rosenpass-wireguard-broker = { path = "wireguard-broker" }
|
rosenpass-wireguard-broker = { path = "wireguard-broker" }
|
||||||
doc-comment = "0.3.3"
|
doc-comment = "0.3.3"
|
||||||
base64ct = { version = "1.6.0", default-features = false }
|
base64ct = {version = "1.6.0", default-features=false}
|
||||||
zeroize = "1.8.1"
|
zeroize = "1.8.1"
|
||||||
memoffset = "0.9.1"
|
memoffset = "0.9.1"
|
||||||
thiserror = "1.0.64"
|
thiserror = "1.0.64"
|
||||||
@@ -41,9 +41,7 @@ env_logger = "0.10.2"
|
|||||||
toml = "0.7.8"
|
toml = "0.7.8"
|
||||||
static_assertions = "1.1.0"
|
static_assertions = "1.1.0"
|
||||||
allocator-api2 = "0.2.14"
|
allocator-api2 = "0.2.14"
|
||||||
memsec = { git = "https://github.com/rosenpass/memsec.git", rev = "aceb9baee8aec6844125bd6612f92e9a281373df", features = [
|
memsec = { git="https://github.com/rosenpass/memsec.git" ,rev="aceb9baee8aec6844125bd6612f92e9a281373df", features = [ "alloc_ext", ] }
|
||||||
"alloc_ext",
|
|
||||||
] }
|
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
typenum = "1.17.0"
|
typenum = "1.17.0"
|
||||||
log = { version = "0.4.22" }
|
log = { version = "0.4.22" }
|
||||||
@@ -53,23 +51,23 @@ arbitrary = { version = "1.3.2", features = ["derive"] }
|
|||||||
anyhow = { version = "1.0.89", features = ["backtrace", "std"] }
|
anyhow = { version = "1.0.89", features = ["backtrace", "std"] }
|
||||||
mio = { version = "1.0.2", features = ["net", "os-poll"] }
|
mio = { version = "1.0.2", features = ["net", "os-poll"] }
|
||||||
oqs-sys = { version = "0.9.1", default-features = false, features = [
|
oqs-sys = { version = "0.9.1", default-features = false, features = [
|
||||||
'classic_mceliece',
|
'classic_mceliece',
|
||||||
'kyber',
|
'kyber',
|
||||||
] }
|
] }
|
||||||
blake2 = "0.10.6"
|
blake2 = "0.10.6"
|
||||||
chacha20poly1305 = { version = "0.10.1", default-features = false, features = [
|
chacha20poly1305 = { version = "0.10.1", default-features = false, features = [
|
||||||
"std",
|
"std",
|
||||||
"heapless",
|
"heapless",
|
||||||
] }
|
] }
|
||||||
zerocopy = { version = "0.7.35", features = ["derive"] }
|
zerocopy = { version = "0.7.35", features = ["derive"] }
|
||||||
home = "0.5.9"
|
home = "0.5.9"
|
||||||
derive_builder = "0.20.1"
|
derive_builder = "0.20.1"
|
||||||
tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
|
tokio = { version = "1.40", features = ["macros", "rt-multi-thread"] }
|
||||||
postcard = { version = "1.0.10", features = ["alloc"] }
|
postcard= {version = "1.0.10", features = ["alloc"]}
|
||||||
libcrux = { version = "0.0.2-pre.2" }
|
libcrux = { version = "0.0.2-pre.2" }
|
||||||
hex-literal = { version = "0.4.1" }
|
hex-literal = { version = "0.4.1" }
|
||||||
hex = { version = "0.4.3" }
|
hex = { version = "0.4.3" }
|
||||||
heck = { version = "0.5.0" }
|
heck = { version = "0.5.0" }
|
||||||
libc = { version = "0.2" }
|
libc = { version = "0.2" }
|
||||||
uds = { git = "https://github.com/rosenpass/uds" }
|
uds = { git = "https://github.com/rosenpass/uds" }
|
||||||
|
|
||||||
@@ -81,7 +79,7 @@ libfuzzer-sys = "0.4"
|
|||||||
test_bin = "0.4.0"
|
test_bin = "0.4.0"
|
||||||
criterion = "0.4.0"
|
criterion = "0.4.0"
|
||||||
allocator-api2-tests = "0.2.15"
|
allocator-api2-tests = "0.2.15"
|
||||||
procspawn = { version = "1.0.1", features = ["test-support"] }
|
procspawn = {version = "1.0.1", features= ["test-support"]}
|
||||||
|
|
||||||
|
|
||||||
#Broker dependencies (might need cleanup or changes)
|
#Broker dependencies (might need cleanup or changes)
|
||||||
|
|||||||
@@ -23,4 +23,4 @@ static_assertions = { workspace = true }
|
|||||||
zeroize = { workspace = true }
|
zeroize = { workspace = true }
|
||||||
chacha20poly1305 = { workspace = true }
|
chacha20poly1305 = { workspace = true }
|
||||||
blake2 = { workspace = true }
|
blake2 = { workspace = true }
|
||||||
libcrux = { workspace = true, optional = true }
|
libcrux = { workspace = true, optional = true }
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ mio = { workspace = true }
|
|||||||
rand = { workspace = true }
|
rand = { workspace = true }
|
||||||
zerocopy = { workspace = true }
|
zerocopy = { workspace = true }
|
||||||
home = { workspace = true }
|
home = { workspace = true }
|
||||||
derive_builder = { workspace = true }
|
derive_builder = {workspace = true}
|
||||||
rosenpass-wireguard-broker = { workspace = true }
|
rosenpass-wireguard-broker = {workspace = true}
|
||||||
zeroize = { workspace = true }
|
zeroize = { workspace = true }
|
||||||
hex-literal = { workspace = true, optional = true }
|
hex-literal = { workspace = true, optional = true }
|
||||||
hex = { workspace = true, optional = true }
|
hex = { workspace = true, optional = true }
|
||||||
@@ -68,21 +68,15 @@ anyhow = { workspace = true }
|
|||||||
criterion = { workspace = true }
|
criterion = { workspace = true }
|
||||||
test_bin = { workspace = true }
|
test_bin = { workspace = true }
|
||||||
stacker = { workspace = true }
|
stacker = { workspace = true }
|
||||||
serial_test = { workspace = true }
|
serial_test = {workspace = true}
|
||||||
procspawn = { workspace = true }
|
procspawn = {workspace = true}
|
||||||
tempfile = { workspace = true }
|
tempfile = { workspace = true }
|
||||||
rustix = { workspace = true }
|
rustix = {workspace = true}
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["experiment_api"]
|
default = ["experiment_api"]
|
||||||
experiment_memfd_secret = ["rosenpass-wireguard-broker/experiment_memfd_secret"]
|
experiment_memfd_secret = ["rosenpass-wireguard-broker/experiment_memfd_secret"]
|
||||||
experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux"]
|
experiment_libcrux = ["rosenpass-ciphers/experiment_libcrux"]
|
||||||
experiment_api = [
|
experiment_api = ["hex-literal", "uds", "command-fds", "rosenpass-util/experiment_file_descriptor_passing", "rosenpass-wireguard-broker/experiment_api"]
|
||||||
"hex-literal",
|
internal_testing = []
|
||||||
"uds",
|
|
||||||
"command-fds",
|
|
||||||
"rosenpass-util/experiment_file_descriptor_passing",
|
|
||||||
"rosenpass-wireguard-broker/experiment_api",
|
|
||||||
]
|
|
||||||
internal_testing = []
|
|
||||||
internal_bin_gen_ipc_msg_types = ["hex", "heck"]
|
internal_bin_gen_ipc_msg_types = ["hex", "heck"]
|
||||||
|
|||||||
@@ -20,9 +20,9 @@ rosenpass-ciphers = { workspace = true }
|
|||||||
rosenpass-cipher-traits = { workspace = true }
|
rosenpass-cipher-traits = { workspace = true }
|
||||||
rosenpass-secret-memory = { workspace = true }
|
rosenpass-secret-memory = { workspace = true }
|
||||||
rosenpass-util = { workspace = true }
|
rosenpass-util = { workspace = true }
|
||||||
rosenpass-wireguard-broker = { workspace = true }
|
rosenpass-wireguard-broker = {workspace = true}
|
||||||
|
|
||||||
tokio = { workspace = true }
|
tokio = {workspace = true}
|
||||||
|
|
||||||
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
|
[target.'cfg(any(target_os = "linux", target_os = "freebsd"))'.dependencies]
|
||||||
ctrlc-async = "3.2"
|
ctrlc-async = "3.2"
|
||||||
@@ -35,8 +35,8 @@ netlink-packet-generic = "0.3"
|
|||||||
netlink-packet-wireguard = "0.2"
|
netlink-packet-wireguard = "0.2"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
tempfile = { workspace = true }
|
tempfile = {workspace = true}
|
||||||
stacker = { workspace = true }
|
stacker = {workspace = true}
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
experiment_memfd_secret = []
|
experiment_memfd_secret = []
|
||||||
|
|||||||
@@ -21,6 +21,6 @@ log = { workspace = true }
|
|||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
allocator-api2-tests = { workspace = true }
|
allocator-api2-tests = { workspace = true }
|
||||||
tempfile = { workspace = true }
|
tempfile = {workspace = true}
|
||||||
base64ct = { workspace = true }
|
base64ct = {workspace = true}
|
||||||
procspawn = { workspace = true }
|
procspawn = {workspace = true}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ readme = "readme.md"
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
zerocopy = { workspace = true }
|
zerocopy = { workspace = true }
|
||||||
rosenpass-secret-memory = { workspace = true }
|
rosenpass-secret-memory = {workspace = true}
|
||||||
|
|
||||||
# Privileged only
|
# Privileged only
|
||||||
wireguard-uapi = { workspace = true }
|
wireguard-uapi = { workspace = true }
|
||||||
@@ -24,20 +24,20 @@ anyhow = { workspace = true }
|
|||||||
clap = { workspace = true }
|
clap = { workspace = true }
|
||||||
env_logger = { workspace = true }
|
env_logger = { workspace = true }
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
derive_builder = { workspace = true }
|
derive_builder = {workspace = true}
|
||||||
postcard = { workspace = true }
|
postcard = {workspace = true}
|
||||||
# Problem in CI, unknown reasons: dependency (libc) specified without providing a local path, Git repository, version, or workspace dependency to use
|
# Problem in CI, unknown reasons: dependency (libc) specified without providing a local path, Git repository, version, or workspace dependency to use
|
||||||
# Maybe something about the combination of features and optional crates?
|
# Maybe something about the combination of features and optional crates?
|
||||||
rustix = { version = "0.38.37", optional = true }
|
rustix = { version = "0.38.37", optional = true }
|
||||||
libc = { version = "0.2", optional = true }
|
libc = { version = "0.2", optional = true }
|
||||||
|
|
||||||
# Mio broker client
|
# Mio broker client
|
||||||
mio = { workspace = true }
|
mio = { workspace = true }
|
||||||
rosenpass-util = { workspace = true }
|
rosenpass-util = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
rand = { workspace = true }
|
rand = {workspace = true}
|
||||||
procspawn = { workspace = true }
|
procspawn = {workspace = true}
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
experiment_api = ["rustix", "libc"]
|
experiment_api = ["rustix", "libc"]
|
||||||
@@ -49,7 +49,7 @@ path = "src/bin/priviledged.rs"
|
|||||||
test = false
|
test = false
|
||||||
doc = false
|
doc = false
|
||||||
required-features = ["experiment_api"]
|
required-features = ["experiment_api"]
|
||||||
cfg = { target_os = "linux" }
|
cfg = { target_os = "linux" }
|
||||||
|
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "rosenpass-wireguard-broker-socket-handler"
|
name = "rosenpass-wireguard-broker-socket-handler"
|
||||||
@@ -57,4 +57,4 @@ test = false
|
|||||||
path = "src/bin/socket_handler.rs"
|
path = "src/bin/socket_handler.rs"
|
||||||
doc = false
|
doc = false
|
||||||
required-features = ["experiment_api"]
|
required-features = ["experiment_api"]
|
||||||
cfg = { target_os = "linux" }
|
cfg = { target_os = "linux" }
|
||||||
|
|||||||
Reference in New Issue
Block a user