Skip to content

Commit

Permalink
Switched from aws-lc-sys to ring
Browse files Browse the repository at this point in the history
  • Loading branch information
manforowicz committed Jun 7, 2024
1 parent d79fc41 commit cbcd5e5
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 50 deletions.
25 changes: 7 additions & 18 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,12 @@ members = [
"gday_file_transfer",
]

# Config for 'cargo dist'
# specifying build dependencies for aws-lc-sys
[workspace.metadata.dist.dependencies.homebrew]
llvm = '*'
cmake = '*'


[workspace.metadata.dist.dependencies.apt]
clang = '*'
build-essential = '*'
cmake = '*'


[workspace.metadata.dist.dependencies.chocolatey]
clang = '*'
cmake = '*'
nasm = '*'
# Keys that workspace packages will inherit
[workspace.package]
authors = ["Marcin Anforowicz"]
edition = "2021"
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Config for 'cargo dist'
[workspace.metadata.dist]
Expand All @@ -39,7 +28,7 @@ installers = []
# Target platforms to build apps for (Rust target-triple syntax)
targets = ["aarch64-apple-darwin", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
# Publish jobs to run in CI
pr-run-mode = "plan"
pr-run-mode = "upload"
# Whether to install an updater program
install-updater = false

Expand Down
17 changes: 7 additions & 10 deletions gday/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "gday"
version = "0.1.1"
authors = ["Marcin Anforowicz"]
edition = "2021"
description = "Command line tool to send files easily, securely, and directly, without a relay or port forwarding."
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Inherit these keys from workspace toml
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -23,9 +25,4 @@ owo-colors = "4.0.0"
postcard = "1.0.8"
rand = "0.8.5"
serde = { version = "1.0.203", features = ["serde_derive"] }
thiserror = "1.0.61"

[dev-dependencies]
assert_cmd = "2.0.14"
gday_server = { version = "0.1.1", path = "../gday_server" }
tempfile = "3.10.1"
thiserror = "1.0.61"
10 changes: 6 additions & 4 deletions gday_contact_exchange_protocol/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "gday_contact_exchange_protocol"
version = "0.1.1"
authors = ["Marcin Anforowicz"]
edition = "2021"
description = "Protocol that peers can use to exchange their public and private socket addresses via a server."
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Inherit these keys from workspace toml
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
10 changes: 6 additions & 4 deletions gday_encryption/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "gday_encryption"
version = "0.1.1"
authors = ["Marcin Anforowicz"]
edition = "2021"
description = "A simple ChaCha20Poly1305 encryption wrapper around an IO stream."
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Inherit these keys from workspace toml
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
10 changes: 6 additions & 4 deletions gday_file_transfer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "gday_file_transfer"
version = "0.1.1"
authors = ["Marcin Anforowicz"]
edition = "2021"
description = "A minimal protocol to securely transfer files over an IO stream. Used by gday."
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Inherit these keys from workspace toml
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
12 changes: 7 additions & 5 deletions gday_hole_punch/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "gday_hole_punch"
version = "0.1.1"
authors = ["Marcin Anforowicz"]
edition = "2021"
description = "Establish an authenticated peer-to-peer internet connection using TCP hole-punching."
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Inherit these keys from workspace toml
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -14,7 +16,7 @@ blake3 = "1.5.1"
gday_contact_exchange_protocol = { version = "0.1.1", path = "../gday_contact_exchange_protocol" }
log = "0.4.21"
rand = "0.8.5"
rustls = "0.23.9"
rustls = { version = "0.23.9", features = ["ring", "log", "logging", "std", "tls12"], default-features = false }
serde = "1.0.203"
socket2 = "0.5.7"
spake2 = { version = "0.4.0", features = ["std"] }
Expand Down
12 changes: 7 additions & 5 deletions gday_server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
[package]
name = "gday_server"
version = "0.1.1"
authors = ["Marcin Anforowicz"]
edition = "2021"
description = "A server that lets 2 peers exchange their private and public addresses via the gday contact exchange protocol."
license = "MIT"
repository = "https://github.com/manforowicz/gday/"

# Inherit these keys from workspace toml
authors.workspace = true
edition.workspace = true
license.workspace = true
repository.workspace = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -19,7 +21,7 @@ tokio = { version = "1.38.0", features = [
"time",
"sync",
] }
tokio-rustls = "0.26.0"
tokio-rustls = { version = "0.26.0", features = ["ring", "logging", "tls12"], default-features = false }
gday_contact_exchange_protocol = { path = "../gday_contact_exchange_protocol" }
thiserror = "1.0.61"
log = "0.4.21"
Expand Down

0 comments on commit cbcd5e5

Please sign in to comment.