Merge pull request '1.3.1 Release' (#3) from develop into main

Reviewed-on: Infendro/otp-kt#3

README.md

@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation("com.infendro:otp:1.3.0")
+    implementation("com.infendro:otp:1.3.1")
 }
 ```
 
@@ -26,7 +26,7 @@ dependencies {
 fun main() {
     // create TOTP instance
     val totp = TOTP(
-        function = SHA1,
+        function = SHA1(),
         length = 6,
         period = 30.seconds,
     )

build.gradle.kts

@@ -5,7 +5,7 @@ import com.infendro.plugin.token
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 group = "com.infendro"
-version = "1.3.0"
+version = "1.3.1"
 
 plugins {
     alias(libs.plugins.infendro)

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
 infendro = "1.1.0"
 kotlin = "2.3.0"
-bytes = "1.4.0"
+bytes = "1.4.2"
-hash = "1.6.0"
+hash = "1.7.0"
-mac = "1.4.0"
+mac = "1.5.0"
 
 [plugins]
 infendro = { id = "com.infendro.plugin", version.ref = "infendro" }

src/commonMain/kotlin/com/infendro/otp/HOTP.kt

@@ -9,7 +9,7 @@ import com.infendro.otp.util.pow
 import kotlin.experimental.and
 
 class HOTP(
-    val function: HashFunction = SHA1,
+    val function: HashFunction = SHA1(),
     val length: Int = 6,
 ) {
     private val hmac = HMAC(function)
@@ -19,14 +19,14 @@ class HOTP(
         return otp(secret, counter)
     }
 
+    fun verify(secret: ByteArray, counter: Long, otp: String): Boolean {
+        return generate(secret, counter) == otp
+    }
+
     private fun otp(secret: ByteArray, counter: Long): String {
         val hash = hmac.hash(secret, counter.toByteArray())
         val offset = (hash.last() and 0xF).toInt()
         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
-    }
 }

src/commonMain/kotlin/com/infendro/otp/TOTP.kt

@@ -7,7 +7,7 @@ import kotlin.time.Duration.Companion.seconds
 import kotlin.time.Instant
 
 class TOTP(
-    val function: HashFunction = SHA1,
+    val function: HashFunction = SHA1(),
     val length: Int = 6,
     val period: Duration = 30.seconds,
 ) {
@@ -17,13 +17,13 @@ class TOTP(
         return hotp.generate(secret, counter(instant))
     }
 
+    fun verify(secret: ByteArray, instant: Instant, otp: String): Boolean {
+        return generate(secret, instant) == otp
+    }
+
     private fun counter(instant: Instant): Long {
         val ms = instant.toEpochMilliseconds()
         val d = period.inWholeMilliseconds
         return ms / d
     }
-
-    fun verify(secret: ByteArray, instant: Instant, otp: String): Boolean {
-        return generate(secret, instant) == otp
-    }
 }