diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a201cb3d5..4ae1533915b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 0.10.1 + +* `Versions`: + * `Ktor`: `2.0.0` -> `2.0.1` +* `Crypto`: + * Add `hmacSha256` + * Add `hex` + ## 0.10.0 * `Versions`: diff --git a/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Hex.kt b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Hex.kt new file mode 100644 index 00000000000..a53b5314f5e --- /dev/null +++ b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Hex.kt @@ -0,0 +1,15 @@ +package dev.inmo.micro_utils.crypto + +val HEX_ARRAY = "0123456789abcdef".toCharArray() + +fun SourceBytes.hex(): String { + val hexChars = CharArray(size * 2) + for (j in indices) { + val v: Int = this[j].toInt() and 0xFF + hexChars[j * 2] = HEX_ARRAY[v ushr 4] + hexChars[j * 2 + 1] = HEX_ARRAY[v and 0x0F] + } + return hexChars.concatToString() +} + +fun SourceString.hex(): String = encodeToByteArray().hex() diff --git a/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Sha.kt b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Sha.kt new file mode 100644 index 00000000000..52ea32f236e --- /dev/null +++ b/crypto/src/commonMain/kotlin/dev/inmo/micro_utils/crypto/Sha.kt @@ -0,0 +1,3 @@ +package dev.inmo.micro_utils.crypto + +expect fun SourceString.hmacSha256(key: String): String diff --git a/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Hex.kt b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Hex.kt new file mode 100644 index 00000000000..16184b6635a --- /dev/null +++ b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/Hex.kt @@ -0,0 +1,15 @@ +package dev.inmo.micro_utils.crypto + +import kotlin.test.* + +class Hex { + @Test + fun testSimpleHmacSHA256Message() { + val text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + val resultHex = text.hex() + assertEquals( + "4c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742c2073656420646f20656975736d6f642074656d706f7220696e6369646964756e74207574206c61626f726520657420646f6c6f7265206d61676e6120616c697175612e20557420656e696d206164206d696e696d2076656e69616d2c2071756973206e6f737472756420657865726369746174696f6e20756c6c616d636f206c61626f726973206e69736920757420616c697175697020657820656120636f6d6d6f646f20636f6e7365717561742e2044756973206175746520697275726520646f6c6f7220696e20726570726568656e646572697420696e20766f6c7570746174652076656c697420657373652063696c6c756d20646f6c6f726520657520667567696174206e756c6c612070617269617475722e204578636570746575722073696e74206f6363616563617420637570696461746174206e6f6e2070726f6964656e742c2073756e7420696e2063756c706120717569206f666669636961206465736572756e74206d6f6c6c697420616e696d20696420657374206c61626f72756d2e", + resultHex + ) + } +} diff --git a/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/HmacSHA256.kt b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/HmacSHA256.kt new file mode 100644 index 00000000000..60ea7433568 --- /dev/null +++ b/crypto/src/commonTest/kotlin/dev/inmo/micro_utils/crypto/HmacSHA256.kt @@ -0,0 +1,12 @@ +package dev.inmo.micro_utils.crypto + +import kotlin.test.* + +class HmacSHA256 { + @Test + fun testSimpleHmacSHA256Message() { + val text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + val resultSha = text.hmacSha256("Example") + assertEquals("5a481d59329ef862b158eedc95392ebb22492ba3014661a3379d8201db992484", resultSha) + } +} diff --git a/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt b/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt index 3f5e90439f8..f6ac57bb317 100644 --- a/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt +++ b/crypto/src/jsMain/kotlin/dev/inmo/micro_utils/crypto/CryptoJs.kt @@ -7,3 +7,7 @@ external interface CryptoJs { @JsModule("crypto-js") @JsNonModule external val CryptoJS: CryptoJs + +actual fun SourceString.hmacSha256(key: String): String { + return CryptoJS.asDynamic().HmacSHA256(this, key).toString().unsafeCast() +} diff --git a/crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/ShaHexActual.kt b/crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/ShaHexActual.kt new file mode 100644 index 00000000000..90c27879ad8 --- /dev/null +++ b/crypto/src/jvmMain/kotlin/dev/inmo/micro_utils/crypto/ShaHexActual.kt @@ -0,0 +1,13 @@ +package dev.inmo.micro_utils.crypto + +import javax.crypto.Mac +import javax.crypto.spec.SecretKeySpec + +actual fun SourceString.hmacSha256(key: String): String { + val mac = Mac.getInstance("HmacSHA256") + + val secretKey = SecretKeySpec(key.toByteArray(), "HmacSHA256") + mac.init(secretKey) + + return mac.doFinal(toByteArray()).hex() +} diff --git a/gradle.properties b/gradle.properties index d66cba7e505..5236d750e64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,5 +14,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.10.0 -android_code_version=115 +version=0.10.1 +android_code_version=116 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8a12bd46d70..8e1f1fa7456 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ jb-dokka = "1.6.21" klock = "2.7.0" uuid = "0.4.0" -ktor = "2.0.0" +ktor = "2.0.1" gh-release = "2.3.7"