Apply syntax suggestion to read_cbor_map! macro.
This commit is contained in:
Guillaume Endignoux
@@ -125,16 +125,17 @@ impl TryFrom<cbor::Value> for AuthenticatorMakeCredentialParameters {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
client_data_hash @ 1,
|
||||
rp @ 2,
|
||||
user @ 3,
|
||||
cred_param_vec @ 4,
|
||||
exclude_list @ 5,
|
||||
extensions @ 6,
|
||||
options @ 7,
|
||||
pin_uv_auth_param @ 8,
|
||||
pin_uv_auth_protocol @ 9,
|
||||
let {
|
||||
1 => client_data_hash,
|
||||
2 => rp,
|
||||
3 => user,
|
||||
4 => cred_param_vec,
|
||||
5 => exclude_list,
|
||||
6 => extensions,
|
||||
7 => options,
|
||||
8 => pin_uv_auth_param,
|
||||
9 => pin_uv_auth_protocol,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let client_data_hash = extract_byte_string(ok_or_missing(client_data_hash)?)?;
|
||||
@@ -207,14 +208,15 @@ impl TryFrom<cbor::Value> for AuthenticatorGetAssertionParameters {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
rp_id @ 1,
|
||||
client_data_hash @ 2,
|
||||
allow_list @ 3,
|
||||
extensions @ 4,
|
||||
options @ 5,
|
||||
pin_uv_auth_param @ 6,
|
||||
pin_uv_auth_protocol @ 7,
|
||||
let {
|
||||
1 => rp_id,
|
||||
2 => client_data_hash,
|
||||
3 => allow_list,
|
||||
4 => extensions,
|
||||
5 => options,
|
||||
6 => pin_uv_auth_param,
|
||||
7 => pin_uv_auth_protocol,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let rp_id = extract_text_string(ok_or_missing(rp_id)?)?;
|
||||
@@ -276,13 +278,14 @@ impl TryFrom<cbor::Value> for AuthenticatorClientPinParameters {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
pin_protocol @ 1,
|
||||
sub_command @ 2,
|
||||
key_agreement @ 3,
|
||||
pin_auth @ 4,
|
||||
new_pin_enc @ 5,
|
||||
pin_hash_enc @ 6,
|
||||
let {
|
||||
1 => pin_protocol,
|
||||
2 => sub_command,
|
||||
3 => key_agreement,
|
||||
4 => pin_auth,
|
||||
5 => new_pin_enc,
|
||||
6 => pin_hash_enc,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let pin_protocol = extract_unsigned(ok_or_missing(pin_protocol)?)?;
|
||||
|
||||
@@ -32,10 +32,11 @@ impl TryFrom<cbor::Value> for PublicKeyCredentialRpEntity {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
rp_id @ "id",
|
||||
rp_icon @ "icon",
|
||||
rp_name @ "name",
|
||||
let {
|
||||
"id" => rp_id,
|
||||
"icon" => rp_icon,
|
||||
"name" => rp_name,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let rp_id = extract_text_string(ok_or_missing(rp_id)?)?;
|
||||
@@ -64,11 +65,12 @@ impl TryFrom<cbor::Value> for PublicKeyCredentialUserEntity {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
user_id @ "id",
|
||||
user_icon @ "icon",
|
||||
user_name @ "name",
|
||||
user_display_name @ "displayName",
|
||||
let {
|
||||
"id" => user_id,
|
||||
"icon" => user_icon,
|
||||
"name" => user_name,
|
||||
"displayName" => user_display_name,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let user_id = extract_byte_string(ok_or_missing(user_id)?)?;
|
||||
@@ -142,9 +144,10 @@ impl TryFrom<cbor::Value> for PublicKeyCredentialParameter {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
alg @ "alg",
|
||||
cred_type @ "type",
|
||||
let {
|
||||
"alg" => alg,
|
||||
"type" => cred_type,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let cred_type = PublicKeyCredentialType::try_from(ok_or_missing(cred_type)?)?;
|
||||
@@ -211,10 +214,11 @@ impl TryFrom<cbor::Value> for PublicKeyCredentialDescriptor {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
key_id @ "id",
|
||||
key_type @ "type",
|
||||
transports @ "transports",
|
||||
let {
|
||||
"id" => key_id,
|
||||
"type" => key_type,
|
||||
"transports" => transports,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let key_type = PublicKeyCredentialType::try_from(ok_or_missing(key_type)?)?;
|
||||
@@ -260,9 +264,10 @@ impl TryFrom<cbor::Value> for MakeCredentialExtensions {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
cred_protect @ "credProtect",
|
||||
hmac_secret @ "hmac-secret",
|
||||
let {
|
||||
"credProtect" => cred_protect,
|
||||
"hmac-secret" => hmac_secret,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let hmac_secret = hmac_secret.map_or(Ok(false), extract_bool)?;
|
||||
@@ -286,8 +291,9 @@ impl TryFrom<cbor::Value> for GetAssertionExtensions {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
hmac_secret @ "hmac-secret",
|
||||
let {
|
||||
"hmac-secret" => hmac_secret,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let hmac_secret = hmac_secret
|
||||
@@ -309,10 +315,11 @@ impl TryFrom<cbor::Value> for GetAssertionHmacSecretInput {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
cose_key @ 1,
|
||||
salt_enc @ 2,
|
||||
salt_auth @ 3,
|
||||
let {
|
||||
1 => cose_key,
|
||||
2 => salt_enc,
|
||||
3 => salt_auth,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let cose_key = extract_map(ok_or_missing(cose_key)?)?;
|
||||
@@ -338,10 +345,11 @@ impl TryFrom<cbor::Value> for MakeCredentialOptions {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
rk @ "rk",
|
||||
up @ "up",
|
||||
uv @ "uv",
|
||||
let {
|
||||
"rk" => rk,
|
||||
"up" => up,
|
||||
"uv" => uv,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let rk = match rk {
|
||||
@@ -372,10 +380,11 @@ impl TryFrom<cbor::Value> for GetAssertionOptions {
|
||||
|
||||
fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
rk @ "rk",
|
||||
up @ "up",
|
||||
uv @ "uv",
|
||||
let {
|
||||
"rk" => rk,
|
||||
"up" => up,
|
||||
"uv" => uv,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
if let Some(options_entry) = rk {
|
||||
@@ -534,14 +543,15 @@ impl TryFrom<cbor::Value> for PublicKeyCredentialSource {
|
||||
CredProtectPolicy, CredRandom, CredentialId, OtherUi, PrivateKey, RpId, UserHandle,
|
||||
};
|
||||
read_cbor_map! {
|
||||
extract_map(cbor_value)?,
|
||||
credential_id @ CredentialId,
|
||||
private_key @ PrivateKey,
|
||||
rp_id @ RpId,
|
||||
user_handle @ UserHandle,
|
||||
other_ui @ OtherUi,
|
||||
cred_random @ CredRandom,
|
||||
cred_protect_policy @ CredProtectPolicy,
|
||||
let {
|
||||
CredentialId => credential_id,
|
||||
PrivateKey => private_key,
|
||||
RpId => rp_id,
|
||||
UserHandle => user_handle,
|
||||
OtherUi => other_ui,
|
||||
CredRandom => cred_random,
|
||||
CredProtectPolicy => cred_protect_policy,
|
||||
} = extract_map(cbor_value)?;
|
||||
};
|
||||
|
||||
let credential_id = extract_byte_string(ok_or_missing(credential_id)?)?;
|
||||
@@ -634,12 +644,13 @@ impl TryFrom<CoseKey> for ecdh::PubKey {
|
||||
|
||||
fn try_from(cose_key: CoseKey) -> Result<Self, Ctap2StatusCode> {
|
||||
read_cbor_map! {
|
||||
cose_key.0,
|
||||
key_type @ 1,
|
||||
algorithm @ 3,
|
||||
curve @ -1,
|
||||
x_bytes @ -2,
|
||||
y_bytes @ -3,
|
||||
let {
|
||||
1 => key_type,
|
||||
3 => algorithm,
|
||||
-1 => curve,
|
||||
-2 => x_bytes,
|
||||
-3 => y_bytes,
|
||||
} = cose_key.0;
|
||||
};
|
||||
|
||||
let key_type = extract_integer(ok_or_missing(key_type)?)?;
|
||||
|
||||
Reference in New Issue
Block a user