Fix TOTP tests

Author: orion78fr

Cargo.toml

@@ -15,4 +15,4 @@ hmac = "0.12.0"
 sha-1 = "0.10.0"
 sha2 = "0.10.1"
 base32 = "0.4.0"
-url = "2.2.2"
+url = "2.2.2"

src/hotp.rs

@@ -41,11 +41,20 @@ impl HOTP {
         }
     }
 
+    pub fn new_from_utf8(secret: &str, digits: u32) -> Self {
+        HOTP::new(secret.as_bytes(), digits)
+    }
+
+    pub fn new_from_base32(secret: &str, digits: u32) -> Self {
+        let decoded = base32_decode(secret).expect("Failed to decode base32 string");
+        HOTP::new(&decoded, digits)
+    }
+
     /// Creates a new HOTP instance from a utf8-encoded string secret
     ///
     /// Internally calls [`HOTP::new`] with the string's byte representation
     pub fn from_utf8(secret: &str) -> Self {
-        HOTP::new(secret.as_bytes(), 6)
+        HOTP::new_from_utf8(secret, 6)
     }
 
     /// Creates a new HOTP instance from a base32-encoded string secret
@@ -56,8 +65,7 @@ impl HOTP {
     /// This method panics if the provided string is not correctly base32
     /// encoded.
     pub fn from_base32(secret: &str) -> Self {
-        let decoded = base32_decode(secret).expect("Failed to decode base32 string");
-        HOTP::new(&decoded, 6)
+        HOTP::new_from_base32(secret, 6)
     }
 }
 

src/totp.rs

@@ -46,6 +46,15 @@ impl TOTP {
         }
     }
 
+    pub fn new_from_utf8(secret: &str, mac_digest: MacDigest, digits: u32, period: u64) -> Self {
+        TOTP::new(secret.as_bytes(), mac_digest, digits, period)
+    }
+
+    pub fn new_from_base32(secret: &str, mac_digest: MacDigest, digits: u32, period: u64) -> Self {
+        let decoded = base32_decode(secret).expect("Failed to decode base32 string");
+        TOTP::new(&decoded, mac_digest, digits, period)
+    }
+
     /// Creates a new TOTP instance with a byte-array representation
     /// of the secret
     ///
@@ -76,7 +85,7 @@ impl TOTP {
     /// Like [`TOTP::new_with_digest`], this method allows a digest to be specified
     /// instead of the default SHA1 being used.
     pub fn from_utf8_with_digest(secret: &str, mac_digest: MacDigest) -> Self {
-        TOTP::from_secret_with_digest(secret.as_bytes(), mac_digest)
+        TOTP::new_from_utf8(secret, mac_digest, 6, 30)
     }
 
     /// Creates a new TOTP instance from a base32-encoded string secret
@@ -99,8 +108,7 @@ impl TOTP {
     /// # Panics
     /// This method panics if the provided string is not correctly base32 encoded.
     pub fn from_base32_with_digest(secret: &str, mac_digest: MacDigest) -> Self {
-        let decoded = base32_decode(secret).expect("Failed to decode base32 string");
-        TOTP::from_secret_with_digest(&decoded, mac_digest)
+        TOTP::new_from_base32(secret, mac_digest, 6, 30)
     }
 }
 

tests/totp.rs

@@ -24,7 +24,7 @@ static SECRET_BASE32_SHA512: &str = "GEZDGNBVGY3TQOJQGEZ\
 /// Generic test method to get the TOTP code with
 /// the SHA1 Secret Key as a byte array
 fn run_rfc_test_bytes(time: u64) -> u32 {
-    let totp = TOTP::from_secret(SECRET_BYTES_SHA1);
+    let totp = TOTP::new(SECRET_BYTES_SHA1, MacDigest::SHA1, 8, 30);
     totp.get_otp(time)
 }
 
@@ -36,14 +36,14 @@ fn run_rfc_test_bytes_with_digest(time: u64, digest: MacDigest) -> u32 {
     } else {
         SECRET_BYTES_SHA512
     };
-    let totp = TOTP::from_secret_with_digest(secret, digest);
+    let totp = TOTP::new(secret, digest, 8, 30);
     totp.get_otp(time)
 }
 
 /// Generic test method to get the TOTP code with
 /// the SHA1 Secret Key as a string literal
 fn run_rfc_test_utf8(time: u64) -> u32 {
-    let totp = TOTP::from_utf8(SECRET_UTF8_SHA1);
+    let totp = TOTP::new_from_utf8(SECRET_UTF8_SHA1, MacDigest::SHA1, 8, 30);
     totp.get_otp(time)
 }
 
@@ -55,14 +55,14 @@ fn run_rfc_test_utf8_with_digest(time: u64, digest: MacDigest) -> u32 {
     } else {
         SECRET_UTF8_SHA512
     };
-    let totp = TOTP::from_utf8_with_digest(secret, digest);
+    let totp = TOTP::new_from_utf8(secret, digest, 8, 30);
     totp.get_otp(time)
 }
 
 /// Generic test method to get the TOTP code with
 /// the SHA1 Secret Key as a base32-encoded string
 fn run_rfc_test_base32(time: u64) -> u32 {
-    let totp = TOTP::from_base32(SECRET_BASE32_SHA1);
+    let totp = TOTP::new_from_base32(SECRET_BASE32_SHA1, MacDigest::SHA1, 8, 30);
     totp.get_otp(time)
 }
 
@@ -74,7 +74,7 @@ fn run_rfc_test_base32_with_digest(time: u64, digest: MacDigest) -> u32 {
     } else {
         SECRET_BASE32_SHA512
     };
-    let totp = TOTP::from_base32_with_digest(secret, digest);
+    let totp = TOTP::new_from_base32(secret, digest, 8, 30);
     totp.get_otp(time)
 }