Merge pull request #49 from a-sit-plus/release/2.4.0

Release/2.4.0

Author: JesusMcCloud

.gitignore

@@ -5,10 +5,7 @@ build/
 !**/src/test/**/build/
 
 ### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea
 *.iws
 *.iml
 *.ipr
@@ -39,4 +36,4 @@ bin/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store

.gitmodules

@@ -39,12 +39,10 @@
 * Change `JwsHeader.publicKey` from JsonWebKey to CryptoPublicKey
 * Remove `SignatureValueLength` parameters from JWS & COSE Algorithm Enum class
 * Remove deprecated functions
-* New `CryptoAlgorithm` class
-* New `CryptoSignature` class for easy Asn1 - RawByteArray conversion
 * Rename `Jws` classes
   * New `CryptoAlgorithm` class
   * New `CryptoSignature` class for easy Asn1 - RawByteArray conversion
-* Rename function in file `JcaExtensions.kt` from `.toPublicKey` to `.toJcaPublicKey` to reflect connection to JVMname function in file `JcaExtensions.kt` from `.toPublicKey` to `.toJcaPublicKey` to reflect connection to JVM
+* Rename function in file `JcaExtensions.kt` from `.toPublicKey` to `.toJcaPublicKey` to reflect connection to JVM
 * Remove VcLib-specific constants
 
 #### 2.2.1
@@ -57,3 +55,15 @@
 * Add `CryptoSignature.parseFromJca` function
 * Refactor `CryptoPublicKey.keyID` to `CryptoPublicKey.didEncoded` to better reflect what it actually is
 * Rename `CryptoPublicKey.fromKeyId` to `CryptoPublicKey.fromDid`
+
+### 2.4.0
+* Add Support for EC Point compression
+* Add Support for full Cose-Key Spec
+* Correct Multibase Encoding
+* Change `DID:KEY` encoding to Base58_BTC to comply with draft
+* Add Multibase Encoder/Decoder
+* Add UVarInt datatype (63 bit max)
+* Remove MultibaseHelper
+* Finally make `CoseKey`'s EC Point compression play nicely with kotlinx.serialization
+* Rename `CoseKey.fromKeyId` to `CoseKey.fromDid`
+* Rename `JsonWebKey.fromKeyId` to `JsonWebKey.fromDid`

CHANGELOG.md

@@ -1,7 +1,7 @@
 import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
 
 plugins {
-    id("at.asitplus.gradle.conventions") version "1.9.22+20240213" //version can be omitted for composite build
+    id("at.asitplus.gradle.conventions") version "1.9.10+20240219"
 }
 group = "at.asitplus.crypto"
 
@@ -10,7 +10,7 @@ group = "at.asitplus.crypto"
 apply(plugin = "org.jetbrains.dokka")
 tasks.getByName("dokkaHtmlMultiModule") {
     (this as DokkaMultiModuleTask)
-    outputDirectory.set(File("$buildDir/dokka"))
+    outputDirectory.set(File("${layout.buildDirectory}/dokka"))
     includes.from("README.md")
     moduleName.set("KMP Crypto")
 }

build.gradle.kts

@@ -1,5 +1,9 @@
-import DatatypeVersions.encoding
-import at.asitplus.gradle.*
+import at.asitplus.gradle.datetime
+import at.asitplus.gradle.exportIosFramework
+import at.asitplus.gradle.kmmresult
+import at.asitplus.gradle.napier
+import at.asitplus.gradle.serialization
+import at.asitplus.gradle.setupDokka
 
 plugins {
     kotlin("multiplatform")
@@ -21,21 +25,23 @@ kotlin {
             languageSettings.optIn("kotlin.ExperimentalUnsignedTypes")
         }
 
-        commonMain {
+        val commonMain by getting {
             dependencies {
                 api(project(":datatypes"))
                 api(serialization("cbor"))
                 implementation(napier())
-                implementation("io.matthewnelson.kotlin-components:encoding-base16:${encoding}")
-                implementation("io.matthewnelson.kotlin-components:encoding-base64:${encoding}")
+                implementation(libs.base16)
+                implementation(libs.base64)
+                implementation(libs.bignum) //Intellij bug work-around
             }
         }
 
-        commonTest {
+        val commonTest by getting {
             dependencies {
                 implementation(kotlin("reflect"))
             }
         }
+        val jvmTest by getting
     }
 }
 
@@ -47,7 +53,10 @@ exportIosFramework(
     project(":datatypes")
 )
 
-val javadocJar = setupDokka(baseUrl = "https://github.com/a-sit-plus/kmp-crypto/tree/main/", multiModuleDoc = true)
+val javadocJar = setupDokka(
+    baseUrl = "https://github.com/a-sit-plus/kmp-crypto/tree/main/",
+    multiModuleDoc = true
+)
 
 
 publishing {

buildSrc/build.gradle.kts

@@ -16,7 +16,7 @@ enum class CoseEllipticCurve(val value: Int) {
     P384(2),
     P521(3);
 
-    fun toJwkCurve() = when (this) {
+    fun toEcCurve() = when (this) {
         P256 -> EcCurve.SECP_256_R_1
         P384 -> EcCurve.SECP_384_R_1
         P521 -> EcCurve.SECP_521_R_1

buildSrc/src/main/kotlin/DatatypeVersions.kt

@@ -4,9 +4,13 @@ import at.asitplus.crypto.datatypes.cose.io.cborSerializer
 import io.github.aakira.napier.Napier
 import io.matthewnelson.encoding.base16.Base16
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
-import kotlinx.serialization.*
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.cbor.ByteString
 import kotlinx.serialization.cbor.CborLabel
+import kotlinx.serialization.decodeFromByteArray
+import kotlinx.serialization.encodeToByteArray
 
 /**
  * Protected header of a [CoseSigned].