From 604f0848157f660dff850b190f1fc42375e4fcb4 Mon Sep 17 00:00:00 2001 From: Fabian Kaczmarczyck Date: Fri, 5 Feb 2021 14:52:38 +0100 Subject: [PATCH] rename require_ to ensure --- src/ctap/mod.rs | 4 ++-- src/ctap/pin_protocol_v1.rs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ctap/mod.rs b/src/ctap/mod.rs index 0579f62..4d153f4 100644 --- a/src/ctap/mod.rs +++ b/src/ctap/mod.rs @@ -638,7 +638,7 @@ where } self.pin_protocol_v1 .has_permission(PinPermission::MakeCredential)?; - self.pin_protocol_v1.require_rp_id_permission(&rp_id)?; + self.pin_protocol_v1.ensure_rp_id_permission(&rp_id)?; UP_FLAG | UV_FLAG | AT_FLAG | ed_flag } None => { @@ -923,7 +923,7 @@ where } self.pin_protocol_v1 .has_permission(PinPermission::GetAssertion)?; - self.pin_protocol_v1.require_rp_id_permission(&rp_id)?; + self.pin_protocol_v1.ensure_rp_id_permission(&rp_id)?; UV_FLAG } None => { diff --git a/src/ctap/pin_protocol_v1.rs b/src/ctap/pin_protocol_v1.rs index d95b5d1..3b00a35 100644 --- a/src/ctap/pin_protocol_v1.rs +++ b/src/ctap/pin_protocol_v1.rs @@ -543,7 +543,7 @@ impl PinProtocolV1 { /// Check if the passed RP ID is associated with the token permission. /// /// If no RP ID is associated, associate the passed RP ID as a side effect. - pub fn require_rp_id_permission(&mut self, rp_id: &str) -> Result<(), Ctap2StatusCode> { + pub fn ensure_rp_id_permission(&mut self, rp_id: &str) -> Result<(), Ctap2StatusCode> { match &self.permissions_rp_id { Some(p) if rp_id != p => Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID), None => { @@ -1230,11 +1230,11 @@ mod test { } #[test] - fn test_require_rp_id_permission() { + fn test_ensure_rp_id_permission() { let mut rng = ThreadRng256 {}; let mut pin_protocol_v1 = PinProtocolV1::new(&mut rng); assert_eq!( - pin_protocol_v1.require_rp_id_permission("example.com"), + pin_protocol_v1.ensure_rp_id_permission("example.com"), Ok(()) ); assert_eq!( @@ -1242,11 +1242,11 @@ mod test { Some(String::from("example.com")) ); assert_eq!( - pin_protocol_v1.require_rp_id_permission("example.com"), + pin_protocol_v1.ensure_rp_id_permission("example.com"), Ok(()) ); assert_eq!( - pin_protocol_v1.require_rp_id_permission("counter-example.com"), + pin_protocol_v1.ensure_rp_id_permission("counter-example.com"), Err(Ctap2StatusCode::CTAP2_ERR_PIN_AUTH_INVALID) ); }