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

Minor changes for kani release #380

Closed
wants to merge 3 commits into from
Closed
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
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ members = [
exclude = ["compat_tester/webauthn-rs-demo-wasm"]

[workspace.dependencies]
base64urlsafedata = { path = "./base64urlsafedata" }
base64urlsafedata = { path = "./base64urlsafedata", version = "0.1.3" }
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-hid-rs = { path = "./fido-hid-rs", version = "0.5.0-dev" }
webauthn-authenticator-rs = { path = "./webauthn-authenticator-rs", version = "0.5.0-dev" }
webauthn-rs = { path = "./webauthn-rs", version = "0.5.0-dev" }
webauthn-rs-core = { path = "./webauthn-rs-core", version = "0.5.0-dev" }
webauthn-rs-proto = { path = "./webauthn-rs-proto", version = "0.5.0-dev" }
webauthn-attestation-ca = { path = "./attestation-ca", version = "0.1.0" }
webauthn-rs-device-catalog = { path = "./device-catalog", version = "0.5.0-20230418" }

async-std = { version = "1.6", features = ["attributes"] }
base64 = "0.21"
Expand Down
6 changes: 6 additions & 0 deletions attestation-ca/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
[package]
name = "webauthn-attestation-ca"
version = "0.1.0"
authors = ["William Brown <[email protected]>"]
edition = "2021"
rust-version = "1.70.0"
license = "MPL-2.0"
description = "Webauthn Attestation Library"
# documentation = "https://docs.rs/kanidm/latest/kanidm/"
repository = "https://github.com/kanidm/webauthn-rs"
Firstyear marked this conversation as resolved.
Show resolved Hide resolved

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

Expand Down
1 change: 0 additions & 1 deletion device-catalog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ authors = ["William Brown <[email protected]>"]
edition = "2021"
description = "Webauthn RS Device Catalog"
repository = "https://github.com/kanidm/webauthn-rs"
readme = "README.md"
keywords = ["webauthn", "authentication"]
categories = ["authentication", "web-programming"]
license = "MPL-2.0"
Expand Down
1 change: 1 addition & 0 deletions fido-key-manager/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use std::time::Duration;
use tokio_stream::StreamExt;
#[cfg(feature = "solokey")]
use webauthn_authenticator_rs::ctap2::SoloKeyAuthenticator;
#[cfg(feature = "solokey")]
use webauthn_authenticator_rs::prelude::WebauthnCError;
use webauthn_authenticator_rs::{
ctap2::{
Expand Down
6 changes: 4 additions & 2 deletions webauthn-authenticator-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ 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, version = "2.8.0" }

windows = { version = "0.41.0", optional = true, features = [
"Win32_Graphics_Gdi",
"Win32_Networking_WindowsWebServices",
Expand All @@ -107,7 +108,8 @@ 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.10.5", optional = true }
tokio = { workspace = true, optional = true }
tokio-stream = { workspace = true, optional = true }
tokio-tungstenite = { workspace = true, optional = true }
Expand Down