Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Upgrade versions of RustCrypto to pre #86

Draft
wants to merge 3 commits into
base: wiktor/support-certs-everywhere
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
836 changes: 126 additions & 710 deletions Cargo.lock

Large diffs are not rendered by default.

28 changes: 19 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ categories = ["authentication", "cryptography", "encoding", "network-programming
exclude = [".github"]

[workspace]
members = [".", "fuzz"]
members = ["."]

[dependencies]
byteorder = "1"
Expand All @@ -26,11 +26,11 @@ log = { version = "0.4", optional = true }
tokio = { version = "1", optional = true, features = ["rt", "net", "time"] }
tokio-util = { version = "0.7", optional = true, features = ["codec"] }
service-binding = { version = "^3" }
ssh-encoding = { version = "0.2" }
ssh-key = { version = "0.6", features = ["crypto", "alloc"] }
ssh-encoding = { version = "0.3.0-pre.0", features = ["alloc"] }
ssh-key = { version = "0.7.0-pre.0", features = ["crypto", "alloc", "rsa"] }
thiserror = "1"
subtle = { version = "2", default-features = false }
signature = { version = "2", features = ["alloc"] }
signature = { version = "2.3.0-pre.4", features = ["alloc"] }
secrecy = "0.8"

[features]
Expand All @@ -41,20 +41,30 @@ agent = ["futures", "log", "tokio", "async-trait", "codec"]
[dev-dependencies]
env_logger = "0.11.3"
rand = "0.8.5"
rsa = { version = "0.9.6", features = ["sha2", "sha1"] }
rsa = { version = "0.10.0-pre.2", features = ["sha2", "sha1"] }
tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync"] }
sha1 = { version = "0.10.6", default-features = false, features = ["oid"] }
sha1 = { version = "0.11.0-pre.4", default-features = false, features = ["oid"] }
testresult = "0.4.0"
hex-literal = "0.4.1"
ssh-key = { version = "0.6.6", features = ["p256", "rsa"] }
p256 = { version = "0.13.2" }
ssh-key = { version = "0.7.0-pre.0", features = ["p256", "rsa"] }
p256 = { version = "0.14.0-pre.1" }
const-str = "0.5.7"
rstest = "0.21.0"
openpgp-card = "0.5.0"
card-backend-pcsc = "0.5.0"
clap = { version = "4.5.7", features = ["derive"] }
secrecy = "0.8.0"
retainer = "0.3.0"
pgp = "0.13.0"
chrono = "0.4.38"
interprocess = "2.2.0"

[patch.crates-io]
# https://github.com/RustCrypto/SSH/pull/251
ssh-key = { git = "https://github.com/RustCrypto/SSH.git" }
# needs a patch of ssh-encoding otherwise the ssh-key patch will pull its own
# and we will have two Encode/Decode traits.
ssh-encoding = { git = "https://github.com/RustCrypto/SSH.git" }

# https://github.com/dalek-cryptography/curve25519-dalek/pull/676
curve25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek.git", branch = "rustcrypto-new-releases" }
ed25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek.git", branch = "rustcrypto-new-releases" }
49 changes: 0 additions & 49 deletions examples/README.md

This file was deleted.

82 changes: 0 additions & 82 deletions examples/agent-socket-info.rs

This file was deleted.

161 changes: 0 additions & 161 deletions examples/extensions.rs

This file was deleted.

Loading
Loading