Adjust CTAP transport casing

Author: AlfioEmanueleFresta

libwebauthn/src/proto/ctap1/model.rs

@@ -12,20 +12,20 @@ use crate::webauthn::CtapError;
 
 #[derive(Debug, Clone, Copy)]
 pub enum Ctap1Transport {
-    BT,
-    BLE,
-    NFC,
-    USB,
+    Bt,
+    Ble,
+    Nfc,
+    Usb,
 }
 
 impl TryFrom<&Ctap2Transport> for Ctap1Transport {
     type Error = CtapError;
     fn try_from(ctap2: &Ctap2Transport) -> Result<Ctap1Transport, Self::Error> {
         match ctap2 {
-            Ctap2Transport::BLE => Ok(Ctap1Transport::BLE),
-            Ctap2Transport::USB => Ok(Ctap1Transport::USB),
-            Ctap2Transport::NFC => Ok(Ctap1Transport::NFC),
-            Ctap2Transport::INTERNAL => Err(CtapError::UnsupportedOption),
+            Ctap2Transport::Ble => Ok(Ctap1Transport::Ble),
+            Ctap2Transport::Usb => Ok(Ctap1Transport::Usb),
+            Ctap2Transport::Nfc => Ok(Ctap1Transport::Nfc),
+            Ctap2Transport::Internal => Err(CtapError::UnsupportedOption),
         }
     }
 }

libwebauthn/src/proto/ctap2/model.rs

@@ -121,19 +121,19 @@ pub enum Ctap2PublicKeyCredentialType {
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
 pub enum Ctap2Transport {
-    BLE,
-    NFC,
-    USB,
-    INTERNAL,
+    Ble,
+    Nfc,
+    Usb,
+    Internal,
 }
 
 impl From<&Ctap1Transport> for Ctap2Transport {
     fn from(ctap1: &Ctap1Transport) -> Ctap2Transport {
         match ctap1 {
-            Ctap1Transport::BT => Ctap2Transport::BLE,
-            Ctap1Transport::BLE => Ctap2Transport::BLE,
-            Ctap1Transport::USB => Ctap2Transport::USB,
-            Ctap1Transport::NFC => Ctap2Transport::NFC,
+            Ctap1Transport::Bt => Ctap2Transport::Ble,
+            Ctap1Transport::Ble => Ctap2Transport::Ble,
+            Ctap1Transport::Usb => Ctap2Transport::Usb,
+            Ctap1Transport::Nfc => Ctap2Transport::Nfc,
         }
     }
 }
@@ -211,13 +211,13 @@ pub enum Ctap2UserVerificationOperation {
 mod tests {
     use crate::proto::ctap2::Ctap2PublicKeyCredentialDescriptor;
 
-    use super::{Ctap2CredentialType, Ctap2COSEAlgorithmIdentifier, Ctap2PublicKeyCredentialType};
+    use super::{Ctap2COSEAlgorithmIdentifier, Ctap2CredentialType, Ctap2PublicKeyCredentialType};
+    use hex;
     use serde_bytes::ByteBuf;
     use serde_cbor;
-    use hex;
 
     #[test]
-    /// Verify CBOR serialization conforms to CTAP canonical standard, including ordering (see #95) 
+    /// Verify CBOR serialization conforms to CTAP canonical standard, including ordering (see #95)
     pub fn credential_type_field_serialization() {
         let credential_type = Ctap2CredentialType {
             algorithm: Ctap2COSEAlgorithmIdentifier::ES256,
@@ -230,7 +230,7 @@ mod tests {
     }
 
     #[test]
-    /// Verify CBOR serialization conforms to CTAP canonical standard, including ordering (see #95) 
+    /// Verify CBOR serialization conforms to CTAP canonical standard, including ordering (see #95)
     pub fn credential_descriptor_serialization() {
         let credential_descriptor = Ctap2PublicKeyCredentialDescriptor {
             id: ByteBuf::from(vec![0x42]),
@@ -242,4 +242,4 @@ mod tests {
         let expected = hex::decode("a2626964414264747970656a7075626c69632d6b6579").unwrap();
         assert_eq!(serialized, expected);
     }
-}
+}

libwebauthn/src/proto/ctap2/model/credential_protection.rs

@@ -0,0 +1,22 @@
+use minicbor::{Decode, Encode};
+
+/// Credential protection policy as defined in the CTAP2 spec.
+/// 
+/// This replaces the ctap_types::ctap2::credential_management::CredentialProtectionPolicy
+/// to avoid external dependency.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Encode, Decode)]
+#[cbor(index_only)]
+pub enum CredentialProtectionPolicy {
+    #[n(1)]
+    UserVerificationOptional = 0x01,
+    #[n(2)]
+    UserVerificationOptionalWithCredentialIdList = 0x02,
+    #[n(3)]
+    UserVerificationRequired = 0x03,
+}
+
+impl Default for CredentialProtectionPolicy {
+    fn default() -> Self {
+        Self::UserVerificationOptional
+    }
+}