mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
Merge branch 'main' into nettest
This commit is contained in:
commit
4992d4ebff
2 changed files with 4 additions and 4 deletions
|
|
@ -918,7 +918,7 @@ where
|
||||||
transports: Some(vec![AuthenticatorTransport::Usb]),
|
transports: Some(vec![AuthenticatorTransport::Usb]),
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
algorithms: Some(vec![ES256_CRED_PARAM]),
|
algorithms: Some(vec![ES256_CRED_PARAM]),
|
||||||
default_cred_protect: DEFAULT_CRED_PROTECT,
|
default_cred_protect: DEFAULT_CRED_PROTECT.is_some(),
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
min_pin_length: self.persistent_store.min_pin_length()?,
|
min_pin_length: self.persistent_store.min_pin_length()?,
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
use super::data_formats::{AuthenticatorTransport, PublicKeyCredentialParameter};
|
use super::data_formats::{AuthenticatorTransport, PublicKeyCredentialParameter};
|
||||||
use super::data_formats::{
|
use super::data_formats::{
|
||||||
CoseKey, CredentialProtectionPolicy, PackedAttestationStatement, PublicKeyCredentialDescriptor,
|
CoseKey, PackedAttestationStatement, PublicKeyCredentialDescriptor,
|
||||||
PublicKeyCredentialUserEntity,
|
PublicKeyCredentialUserEntity,
|
||||||
};
|
};
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
@ -126,7 +126,7 @@ pub struct AuthenticatorGetInfoResponse {
|
||||||
pub transports: Option<Vec<AuthenticatorTransport>>,
|
pub transports: Option<Vec<AuthenticatorTransport>>,
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
pub algorithms: Option<Vec<PublicKeyCredentialParameter>>,
|
pub algorithms: Option<Vec<PublicKeyCredentialParameter>>,
|
||||||
pub default_cred_protect: Option<CredentialProtectionPolicy>,
|
pub default_cred_protect: bool,
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
pub min_pin_length: u8,
|
pub min_pin_length: u8,
|
||||||
#[cfg(feature = "with_ctap2_1")]
|
#[cfg(feature = "with_ctap2_1")]
|
||||||
|
|
@ -171,7 +171,7 @@ impl From<AuthenticatorGetInfoResponse> for cbor::Value {
|
||||||
0x08 => max_credential_id_length,
|
0x08 => max_credential_id_length,
|
||||||
0x09 => transports.map(|vec| cbor_array_vec!(vec)),
|
0x09 => transports.map(|vec| cbor_array_vec!(vec)),
|
||||||
0x0A => algorithms.map(|vec| cbor_array_vec!(vec)),
|
0x0A => algorithms.map(|vec| cbor_array_vec!(vec)),
|
||||||
0x0C => default_cred_protect.map(|p| p as u64),
|
0x0C => default_cred_protect,
|
||||||
0x0D => min_pin_length as u64,
|
0x0D => min_pin_length as u64,
|
||||||
0x0E => firmware_version,
|
0x0E => firmware_version,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue