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

Resolve compilation warnings in fido-mds-tools #454

Merged
merged 2 commits into from
Nov 22, 2024
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
12 changes: 6 additions & 6 deletions compat_tester/webauthn-rs-demo/src/actors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ pub enum TypedCredential {
}

pub struct WebauthnActor {
pub rp_name: String,
pub rp_id: String,
pub rp_origin: Url,
// pub rp_name: String,
// pub rp_id: String,
// pub rp_origin: Url,
/// Used for testing with compat.
wan: WebauthnCore,
/// For demoing the simple cases.
Expand Down Expand Up @@ -81,9 +81,9 @@ impl WebauthnActor {
.expect("Failed to build swan");

WebauthnActor {
rp_name,
rp_id,
rp_origin,
// rp_name,
// rp_id,
// rp_origin,
wan,
swan,
device_cat_strict,
Expand Down
2 changes: 2 additions & 0 deletions fido-key-manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ yubikey = ["webauthn-authenticator-rs/vendor-yubikey"]

default = ["nfc", "usb"]

disable_windows_manifest = []

[dependencies]
webauthn-authenticator-rs = { workspace = true, features = ["ui-cli", "ctap2-management"] }

Expand Down
2 changes: 1 addition & 1 deletion fido-key-manager/build.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fn main() {
let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default();

if !cfg!(disable_windows_manifest) && target_os == "windows" {
if !cfg!(feature = "disable_windows_manifest") && target_os == "windows" {
embed_resource::compile("windows/fido-key-manager.rc", embed_resource::NONE);
}
}
2 changes: 1 addition & 1 deletion fido-mds/src/mds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ pub struct EcdaaAnchor {
pub x: String,
/// base64url encoding of the result of ECPoint2ToB of the ECPoint2 Y = P_2^yY=P
/// See FIDOEcdaaAlgorithm for the definition of ECPoint2ToB.
#[serde(rename = "X")]
#[serde(rename = "Y")]
pub y: String,
/// base64url encoding of the result of BigNumberToB(cc). See section "Issuer Specific ECDAA Parameters" in FIDOEcdaaAlgorithm for an explanation of cc. See FIDOEcdaaAlgorithm for the definition of BigNumberToB.
pub c: String,
Expand Down
1 change: 1 addition & 0 deletions webauthn-authenticator-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ repository = "https://github.com/kanidm/webauthn-rs"

[features]
nfc_raw_transmit = ["nfc"]
nfc_allow_ignored_readers = []

# Basic command line `UiCallback` implementation
ui-cli = ["dep:rpassword"]
Expand Down
2 changes: 1 addition & 1 deletion webauthn-authenticator-rs/src/nfc/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ fn ignored_reader(reader_name: &CStr) -> bool {

let r = IGNORED_READERS.iter().any(|i| reader_name.contains(i));

#[cfg(nfc_allow_ignored_readers)]
#[cfg(feature = "nfc_allow_ignored_readers")]
if r {
warn!("allowing ignored reader: {reader_name:?}");
return false;
Expand Down
2 changes: 2 additions & 0 deletions webauthn-rs-proto/src/wasm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ extern "C" {
pub type PublicKeyCredentialExt;

#[wasm_bindgen(static_method_of = PublicKeyCredentialExt, js_class = "PublicKeyCredential", js_name = isConditionalMediationAvailable, catch)]
/// Is Conditional Mediation Available
pub fn is_conditional_mediation_available() -> Result<::js_sys::Promise, JsValue>;

#[wasm_bindgen(static_method_of = PublicKeyCredentialExt, js_class = "PublicKeyCredential", js_name = isExternalCTAP2SecurityKeySupported, catch)]
/// Is External Ctap2 SecurityKey Supported
pub fn is_external_ctap2_securitykey_supported() -> Result<::js_sys::Promise, JsValue>;
}
Loading