fixing merge problems

src/ctap/data_formats.rs

@@ -448,6 +448,19 @@ pub enum CredentialProtectionPolicy {
     UserVerificationRequired = 0x03,
 }
 
+impl TryFrom<cbor::Value> for CredentialProtectionPolicy {
+    type Error = Ctap2StatusCode;
+
+    fn try_from(cbor_value: cbor::Value) -> Result<Self, Ctap2StatusCode> {
+        match extract_integer(cbor_value)? {
+            0x01 => Ok(CredentialProtectionPolicy::UserVerificationOptional),
+            0x02 => Ok(CredentialProtectionPolicy::UserVerificationOptionalWithCredentialIdList),
+            0x03 => Ok(CredentialProtectionPolicy::UserVerificationRequired),
+            _ => Err(Ctap2StatusCode::CTAP2_ERR_CBOR_UNEXPECTED_TYPE),
+        }
+    }
+}
+
 impl TryFrom<&cbor::Value> for CredentialProtectionPolicy {
     type Error = Ctap2StatusCode;
 
@@ -512,8 +525,8 @@ impl From<PublicKeyCredentialSource> for cbor::Value {
             RpId => Some(credential.rp_id),
             UserHandle => Some(credential.user_handle),
             OtherUi => credential.other_ui,
-            CredRandom => credential.cred_random
+            CredRandom => credential.cred_random,
-            CredProtectPolicy => credential.cred_protect_policy.map(|p| p as i64)
+            CredProtectPolicy => credential.cred_protect_policy.map(|p| p as i64),
         }
     }
 }
@@ -713,6 +726,20 @@ pub(super) fn read_integer(cbor_value: &cbor::Value) -> Result<i64, Ctap2StatusC
     }
 }
 
+fn extract_integer(cbor_value: cbor::Value) -> Result<i64, Ctap2StatusCode> {
+    match cbor_value {
+        cbor::Value::KeyValue(cbor::KeyType::Unsigned(unsigned)) => {
+            if unsigned <= core::i64::MAX as u64 {
+                Ok(unsigned as i64)
+            } else {
+                Err(Ctap2StatusCode::CTAP2_ERR_CBOR_UNEXPECTED_TYPE)
+            }
+        }
+        cbor::Value::KeyValue(cbor::KeyType::Negative(signed)) => Ok(signed),
+        _ => Err(Ctap2StatusCode::CTAP2_ERR_CBOR_UNEXPECTED_TYPE),
+    }
+}
+
 pub fn read_byte_string(cbor_value: &cbor::Value) -> Result<Vec<u8>, Ctap2StatusCode> {
     match cbor_value {
         cbor::Value::KeyValue(cbor::KeyType::ByteString(byte_string)) => Ok(byte_string.to_vec()),