Update tests to demonstrate broken eddsa behaviour in solokey 2 (#374)

kanidm · Oct 25, 2023 · f0c735f · f0c735f
1 parent 377bdc6
commit f0c735f
Show file tree

Hide file tree

Showing 11 changed files with 368 additions and 201 deletions.
diff --git a/compat_tester/webauthn-rs-demo-shared/Cargo.toml b/compat_tester/webauthn-rs-demo-shared/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 rust-version = "1.70.0"
 
 [features]
-core = ["webauthn-rs-core"]
+core = ["webauthn-rs-core", "webauthn-rs-device-catalog"]
 
 [dependencies]
 serde.workspace = true
 
 webauthn-rs-core = { workspace = true, optional = true }
 webauthn-rs-proto = { workspace = true }
-webauthn-rs-device-catalog = { workspace = true }
+webauthn-rs-device-catalog = { workspace = true, optional = true }
diff --git a/compat_tester/webauthn-rs-demo-shared/src/lib.rs b/compat_tester/webauthn-rs-demo-shared/src/lib.rs
@@ -15,6 +15,7 @@ pub use webauthn_rs_proto::{
  RequestChallengeResponse, RequestRegistrationExtensions, UserVerificationPolicy,
 };
 
+#[cfg(feature = "core")]
 use webauthn_rs_device_catalog::Data;
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy)]

diff --git a/compat_tester/webauthn-rs-demo-wasm/src/compat.rs b/compat_tester/webauthn-rs-demo-wasm/src/compat.rs
@@ -212,7 +212,7 @@ impl Component for CompatTest {
  RegisterWithSettings {
  username: "compatuser".to_string(),
  uv: Some(UserVerificationPolicy::Discouraged_DO_NOT_USE),
- algorithm: Some(COSEAlgorithm::all_possible_algs()),
+ algorithm: Some(COSEAlgorithm::secure_algs()),
  attestation: Some(AttestationConveyancePreference::Direct),
  attachment: None,
  extensions: Some(reg_extensions_full()),
@@ -228,7 +228,7 @@ impl Component for CompatTest {
  RegisterWithSettings {
  username: "compatuser".to_string(),
  uv: Some(UserVerificationPolicy::Discouraged_DO_NOT_USE),
- algorithm: Some(COSEAlgorithm::all_possible_algs()),
+ algorithm: Some(COSEAlgorithm::secure_algs()),
  attestation: Some(AttestationConveyancePreference::Indirect),
  attachment: None,
  extensions: Some(reg_extensions_full()),
@@ -314,7 +314,7 @@ impl Component for CompatTest {
  RegisterWithSettings {
  username: "compatuser".to_string(),
  uv: Some(UserVerificationPolicy::Preferred),
- algorithm: Some(COSEAlgorithm::all_possible_algs()),
+ algorithm: Some(COSEAlgorithm::secure_algs()),
  attestation: Some(AttestationConveyancePreference::None),
  attachment: None,
  extensions: Some(reg_extensions_full()),
@@ -330,7 +330,7 @@ impl Component for CompatTest {
  RegisterWithSettings {
  username: "compatuser".to_string(),
  uv: Some(UserVerificationPolicy::Required),
- algorithm: Some(COSEAlgorithm::all_possible_algs()),
+ algorithm: Some(COSEAlgorithm::secure_algs()),
  attestation: Some(AttestationConveyancePreference::None),
  attachment: None,
  extensions: Some(reg_extensions_full()),

diff --git a/compat_tester/webauthn-rs-demo/pkg/webauthn_rs_demo_wasm.d.ts b/compat_tester/webauthn-rs-demo/pkg/webauthn_rs_demo_wasm.d.ts
@@ -12,9 +12,9 @@ export interface InitOutput {
  readonly __wbindgen_malloc: (a: number, b: number) => number;
  readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
  readonly __wbindgen_export_2: WebAssembly.Table;
- readonly _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h2cad393a447460dd: (a: number, b: number, c: number) => void;
- readonly _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9f4dc74766618f13: (a: number, b: number, c: number) => void;
- readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h7a0fd85c60a0da42: (a: number, b: number, c: number) => void;
+ readonly wasm_bindgen__convert__closures__invoke1_mut_ref__hd61ca137dcdeadae: (a: number, b: number, c: number) => void;
+ readonly wasm_bindgen__convert__closures__invoke1__h40e4dc5d0e8c1642: (a: number, b: number, c: number) => void;
+ readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h084f301ad5b480f3: (a: number, b: number, c: number) => void;
  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
  readonly __wbindgen_exn_store: (a: number) => void;
  readonly __wbindgen_free: (a: number, b: number, c: number) => void;