diff --git a/Cargo.toml b/Cargo.toml index ba16ff01..a324415d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", @@ -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" diff --git a/attestation-ca/Cargo.toml b/attestation-ca/Cargo.toml index 37168c1d..009e5edd 100644 --- a/attestation-ca/Cargo.toml +++ b/attestation-ca/Cargo.toml @@ -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 diff --git a/attestation-ca/README.md b/attestation-ca/README.md new file mode 100644 index 00000000..e69de29b diff --git a/sshkey-attest/Cargo.toml b/sshkey-attest/Cargo.toml index 8f850368..b92bac5b 100644 --- a/sshkey-attest/Cargo.toml +++ b/sshkey-attest/Cargo.toml @@ -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 diff --git a/sshkey-attest/src/proto.rs b/sshkey-attest/src/proto.rs index 3927a8ab..5eb38813 100644 --- a/sshkey-attest/src/proto.rs +++ b/sshkey-attest/src/proto.rs @@ -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, diff --git a/webauthn-authenticator-rs/Cargo.toml b/webauthn-authenticator-rs/Cargo.toml index 19e04280..256c9562 100644 --- a/webauthn-authenticator-rs/Cargo.toml +++ b/webauthn-authenticator-rs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "webauthn-authenticator-rs" -version = "0.5.0-dev" +version = "0.5.0" authors = ["William Brown "] edition = "2021" rust-version = "1.70.0" @@ -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", @@ -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 } diff --git a/webauthn-rp-proxy/Cargo.toml b/webauthn-rp-proxy/Cargo.toml index 58550c15..5a0ac29f 100644 --- a/webauthn-rp-proxy/Cargo.toml +++ b/webauthn-rp-proxy/Cargo.toml @@ -5,6 +5,8 @@ edition = "2021" rust-version = "1.70.0" authors = ["Arthur A. Gleckler "] license = "MPL-2.0" +readme = "README.md" +description = "Webauthn RP CLI Proxy" [dependencies] anyhow = "1.0" diff --git a/webauthn-rp-proxy/README.md b/webauthn-rp-proxy/README.md new file mode 100644 index 00000000..350e91a0 --- /dev/null +++ b/webauthn-rp-proxy/README.md @@ -0,0 +1,2 @@ +This tool allows external applications to consume webauthn-rs via a command line interface by +passing JSON messages.