refactor(pin): use icu_normalizer for PIN NFC normalization

Author: AlfioEmanueleFresta

Cargo.lock

@@ -49,7 +49,7 @@ base64-url = "3.0.0"
 dbus = "0.9.5"
 tracing = "0.1.29"
 idna = "1.0.3"
-unicode-normalization = "0.1"
+icu_normalizer = { version = "2", default-features = false, features = ["compiled_data"] }
 publicsuffix = "2.3"
 url = "2.5"
 http = "1"

libwebauthn/Cargo.toml

@@ -21,14 +21,14 @@ use cbc::cipher::{BlockEncryptMut, KeyIvInit};
 use cosey as cose;
 use hkdf::Hkdf;
 use hmac::Mac;
+use icu_normalizer::ComposingNormalizerBorrowed;
 use p256::{
     ecdh::EphemeralSecret, elliptic_curve::sec1::FromEncodedPoint, EncodedPoint,
     PublicKey as P256PublicKey,
 };
 use rand::{rngs::OsRng, thread_rng, Rng, SeedableRng};
 use sha2::{Digest, Sha256};
 use tracing::{error, instrument, warn};
-use unicode_normalization::UnicodeNormalization;
 use x509_parser::nom::AsBytes;
 
 pub mod persistent_token;
@@ -519,7 +519,9 @@ pub(crate) mod internal {
             timeout: Duration,
         ) -> Result<(), Error> {
             // CTAP 2.1 sends the PIN as UTF-8 in Unicode Normalization Form C.
-            let new_pin = new_pin.nfc().collect::<String>();
+            let new_pin = ComposingNormalizerBorrowed::new_nfc()
+                .normalize(&new_pin)
+                .into_owned();
 
             // If the minPINLength member of the authenticatorGetInfo response is absent, then let platformMinPINLengthInCodePoints be 4.
             if new_pin.chars().count() < get_info_response.min_pin_length.unwrap_or(4) as usize {

libwebauthn/src/pin/mod.rs

@@ -1,8 +1,8 @@
 use std::sync::Arc;
 use std::time::Duration;
 
+use icu_normalizer::ComposingNormalizerBorrowed;
 use tracing::{debug, error, info, instrument, warn};
-use unicode_normalization::UnicodeNormalization;
 
 use cosey::PublicKey;
 
@@ -579,7 +579,10 @@ where
         }
     };
     // CTAP 2.1 sends the PIN as UTF-8 in Unicode Normalization Form C.
-    Ok(pin.nfc().collect::<String>().as_bytes().to_owned())
+    Ok(ComposingNormalizerBorrowed::new_nfc()
+        .normalize(&pin)
+        .as_bytes()
+        .to_owned())
 }
 
 pub(crate) async fn try_to_set_pin<C>(