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

Things that you only find during a release #437

Merged
Merged
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
21 changes: 12 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ members = [
# Tutorial / Example sites.
"tutorial/server/tide",
"tutorial/server/axum",
"tutorial/server/actix_web",
# "tutorial/server/actix_web",
"tutorial/wasm",
# Attestatation struct format
"attestation-ca",
Expand All @@ -45,16 +45,19 @@ members = [
exclude = ["compat_tester/webauthn-rs-demo-wasm"]

[workspace.dependencies]
base64urlsafedata = { path = "./base64urlsafedata" }
# These are in release/dependency order.
base64urlsafedata = { path = "./base64urlsafedata", version = "0.5.0" }
fido-hid-rs = { path = "./fido-hid-rs", version = "0.5.0" }
webauthn-attestation-ca = { path = "./attestation-ca", version = "0.5.0" }
webauthn-rs-proto = { path = "./webauthn-rs-proto", version = "0.5.0" }
fido-mds = { path = "./fido-mds", version = "0.5.0" }
webauthn-rs-core = { path = "./webauthn-rs-core", version = "0.5.0" }
webauthn-rs = { path = "./webauthn-rs", version = "0.5.0" }
webauthn-authenticator-rs = { path = "./webauthn-authenticator-rs", version = "0.5.0" }

# Currently un-released
cable-tunnel-server-common = { path = "./cable-tunnel-server/common", version = "0.1.0" }
fido-hid-rs = { path = "./fido-hid-rs" }
webauthn-authenticator-rs = { path = "./webauthn-authenticator-rs" }
webauthn-rs = { path = "./webauthn-rs" }
webauthn-rs-core = { path = "./webauthn-rs-core" }
webauthn-rs-proto = { path = "./webauthn-rs-proto" }
webauthn-attestation-ca = { path = "./attestation-ca" }
webauthn-rs-device-catalog = { path = "./device-catalog" }
fido-mds = { path = "./fido-mds" }

async-std = { version = "1.6", features = ["attributes"] }
base64 = "0.21"
Expand Down
5 changes: 5 additions & 0 deletions attestation-ca/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
name = "webauthn-attestation-ca"
version = "0.5.0"
edition = "2021"
rust-version = "1.70.0"
repository = "https://github.com/kanidm/webauthn-rs"
license = "MPL-2.0"
readme = "README.md"
description = "Webauthn Attestation CA Descriptions"

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

Expand Down
Empty file added attestation-ca/README.md
Empty file.
7 changes: 4 additions & 3 deletions sshkey-attest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ nom.workspace = true
openssl.workspace = true
serde.workspace = true
serde_cbor_2.workspace = true
sshkeys = { git = "https://github.com/dnaeon/rust-sshkeys.git", rev = "fa5bd02dd6e90ee724fdb981253c1e7726a7f534", features = [
"serde",
] }
sshkeys = { version = "0.3.2", features = ["serde"] }
# sshkeys = { git = "https://github.com/dnaeon/rust-sshkeys.git", rev = "fa5bd02dd6e90ee724fdb981253c1e7726a7f534", features = [
# "serde",
# ] }
tracing.workspace = true
uuid = { workspace = true, features = ["serde"] }
webauthn-rs-core.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion sshkey-attest/src/proto.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub use sshkeys::PublicKey;

/// An attested public key. This contains the ssh public key as well as the
/// attestation metadata.
#[derive(Debug, Clone, Serialize, Deserialize)]
#[derive(Debug, Serialize, Deserialize)]
pub struct AttestedPublicKey {
/// The ssh public key
pub pubkey: PublicKey,
Expand Down
10 changes: 7 additions & 3 deletions webauthn-authenticator-rs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "webauthn-authenticator-rs"
version = "0.5.0-dev"
version = "0.5.0"
authors = ["William Brown <william@blackhats.net.au>"]
edition = "2021"
rust-version = "1.70.0"
Expand Down Expand Up @@ -89,7 +89,9 @@ authenticator = { version = "0.3.2-dev.1", optional = true, default-features = f
"crypto_openssl",
], package = "authenticator-ctap2-2021" }

pcsc = { git = "https://github.com/bluetech/pcsc-rust.git", rev = "13e24649be96989cdffb7e73ca3a994b9534ddff", optional = true }
# pcsc = { git = "https://github.com/bluetech/pcsc-rust.git", rev = "13e24649be96989cdffb7e73ca3a994b9534ddff", optional = true }
pcsc = { version = "2.8.2", optional = true }

windows = { version = "0.41.0", optional = true, features = [
"Win32_Graphics_Gdi",
"Win32_Networking_WindowsWebServices",
Expand All @@ -110,7 +112,9 @@ futures.workspace = true
qrcode = { version = "^0.12.0", optional = true }
# btleplug pinned due to https://github.com/deviceplug/btleplug/issues/289
# Advertisements for the same device get dropped by bluez (Linux).
btleplug = { git = "https://github.com/deviceplug/btleplug.git", rev = "6cf2e8a56c73042a5e263e3afbd20603c6c8f4c0", optional = true }
# btleplug = { git = "https://github.com/deviceplug/btleplug.git", rev = "6cf2e8a56c73042a5e263e3afbd20603c6c8f4c0", optional = true }
btleplug = { version = "^0.11.5", optional = true }

tokio = { workspace = true, optional = true }
tokio-stream = { workspace = true, optional = true }
tokio-tungstenite = { workspace = true, optional = true }
Expand Down
2 changes: 2 additions & 0 deletions webauthn-rp-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ edition = "2021"
rust-version = "1.70.0"
authors = ["Arthur A. Gleckler <aag@alum.mit.edu>"]
license = "MPL-2.0"
readme = "README.md"
description = "Webauthn RP CLI Proxy"

[dependencies]
anyhow = "1.0"
Expand Down
2 changes: 2 additions & 0 deletions webauthn-rp-proxy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This tool allows external applications to consume webauthn-rs via a command line interface by
passing JSON messages.
Loading