From f5f073168d35e9030e1d38bf38455965d742e7b7 Mon Sep 17 00:00:00 2001 From: Infendro Date: Fri, 30 Jan 2026 13:23:32 +0100 Subject: [PATCH] minor refactor --- src/commonMain/kotlin/com/infendro/otp/HOTP.kt | 8 ++++---- src/commonMain/kotlin/com/infendro/otp/TOTP.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/commonMain/kotlin/com/infendro/otp/HOTP.kt b/src/commonMain/kotlin/com/infendro/otp/HOTP.kt index ce240ae..687e694 100644 --- a/src/commonMain/kotlin/com/infendro/otp/HOTP.kt +++ b/src/commonMain/kotlin/com/infendro/otp/HOTP.kt @@ -14,10 +14,6 @@ class HOTP( ) { private val hmac = HMAC(function) - fun verify(secret: ByteArray, counter: Long, otp: String): Boolean { - return generate(secret, counter) == otp - } - fun generate(secret: ByteArray, counter: Long): String { require(counter >= 0) return otp(secret, counter) @@ -29,4 +25,8 @@ class HOTP( val otp = (hash.toInt(offset) and 0x7FFFFFFF) % 10.pow(length) return "$otp".padStart(length, '0') } + + fun verify(secret: ByteArray, counter: Long, otp: String): Boolean { + return generate(secret, counter) == otp + } } diff --git a/src/commonMain/kotlin/com/infendro/otp/TOTP.kt b/src/commonMain/kotlin/com/infendro/otp/TOTP.kt index 2a81438..1312534 100644 --- a/src/commonMain/kotlin/com/infendro/otp/TOTP.kt +++ b/src/commonMain/kotlin/com/infendro/otp/TOTP.kt @@ -13,10 +13,6 @@ class TOTP( ) { private val hotp = HOTP(function, length) - fun verify(secret: ByteArray, instant: Instant, otp: String): Boolean { - return generate(secret, instant) == otp - } - fun generate(secret: ByteArray, instant: Instant): String { return hotp.generate(secret, counter(instant)) } @@ -26,4 +22,8 @@ class TOTP( val d = period.inWholeMilliseconds return ms / d } + + fun verify(secret: ByteArray, instant: Instant, otp: String): Boolean { + return generate(secret, instant) == otp + } }