Merge branch 'development' into feature/moreTargets

a-sit-plus · Nov 7, 2024 · 9b88bdf · 9b88bdf
2 parents 59b9c3f + aa7c896
commit 9b88bdf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/...src/jvmTest/kotlin/at/asitplus/signum/indispensable/asn1/Asn1IntegerRepresentationTest.kt b/...src/jvmTest/kotlin/at/asitplus/signum/indispensable/asn1/Asn1IntegerRepresentationTest.kt
@@ -102,4 +102,4 @@ class Asn1IntegerRepresentationTest : FreeSpec({
             }
         }
     }
-})
+})
diff --git a/...e-asn1/src/jvmTest/kotlin/at/asitplus/signum/indispensable/asn1/Asn1NumberEncodingTest.kt b/...e-asn1/src/jvmTest/kotlin/at/asitplus/signum/indispensable/asn1/Asn1NumberEncodingTest.kt
@@ -188,4 +188,4 @@ class Asn1NumberEncodingTest:FreeSpec( {
 
     }
 
-})
+})
diff --git a/...spensable-josef/src/commonMain/kotlin/at/asitplus/signum/indispensable/josef/JwsSigned.kt b/...spensable-josef/src/commonMain/kotlin/at/asitplus/signum/indispensable/josef/JwsSigned.kt
@@ -10,6 +10,7 @@ import io.matthewnelson.encoding.core.Decoder.Companion.decodeToByteArray
 import io.matthewnelson.encoding.core.Encoder.Companion.encodeToString
 import kotlinx.serialization.SerializationStrategy
 import kotlinx.serialization.json.Json
+
 /**
  * Representation of a signed JSON Web Signature object, i.e. consisting of header, payload and signature.
  *
@@ -93,18 +94,14 @@ data class JwsSigned<out P : Any>(
                     plainSignatureInput = it.plainSignatureInput
                 )
             }
-
         /**
          * Called by JWS signing implementations to get the string that will be
          * used as the input for signature calculation
          */
         @Suppress("unused")
-        inline fun prepareJwsSignatureInput(
-            header: JwsHeader,
-            payload: ByteArray,
-            json: Json = Json,
-        ): ByteArray = ("${header.serialize().encodeToByteArray().encodeToString(Base64UrlStrict)}" +
-                ".${payload.encodeToString(Base64UrlStrict)}").encodeToByteArray()
+        fun prepareJwsSignatureInput(header: JwsHeader, payload: ByteArray): ByteArray =
+            (header.serialize().encodeToByteArray().encodeToString(Base64UrlStrict) +
+                    ".${payload.encodeToString(Base64UrlStrict)}").encodeToByteArray()
 
         /**
          * Called by JWS signing implementations to get the string that will be
@@ -116,8 +113,7 @@ data class JwsSigned<out P : Any>(
             payload: T,
             serializer: SerializationStrategy<T>,
             json: Json = Json,
-        ): ByteArray = ("${header.serialize().encodeToByteArray().encodeToString(Base64UrlStrict)}" +
-                ".${json.encodeToString(serializer, payload).encodeToByteArray().encodeToString(Base64UrlStrict)}").encodeToByteArray()
+        ): ByteArray = prepareJwsSignatureInput(header, json.encodeToString(serializer, payload).encodeToByteArray())
     }
 }
 
diff --git a/indispensable/src/commonTest/kotlin/EncodingTest.kt b/indispensable/src/commonTest/kotlin/EncodingTest.kt
@@ -6,4 +6,4 @@ class EncodingTest: FreeSpec({
     "Correct serialName is determined by encoders" {
         ByteArrayBase64UrlSerializer.descriptor.serialName shouldBe "ByteArrayBase64UrlSerializer"
     }
-})
+})
diff --git a/indispensable/src/commonTest/kotlin/at/asitplus/signum/indispensable/BitLengthTest.kt b/indispensable/src/commonTest/kotlin/at/asitplus/signum/indispensable/BitLengthTest.kt
@@ -53,4 +53,4 @@ class BitLengthTest : FreeSpec({
             bitSpacing shouldBe 7u
         }
     }
-})
+})
diff --git a/indispensable/src/jvmTest/kotlin/at/asitplus/signum/ecmath/ECCurveTest.kt b/indispensable/src/jvmTest/kotlin/at/asitplus/signum/ecmath/ECCurveTest.kt
@@ -47,4 +47,4 @@ class ECCurveTest : FreeSpec({
         ECCurve.SECP_384_R_1.coordinateLength.bytes shouldBe 48u
         ECCurve.SECP_521_R_1.coordinateLength.bytes shouldBe 66u
     }
-})
+})
diff --git a/indispensable/src/jvmTest/kotlin/at/asitplus/signum/ecmath/ECPointTest.kt b/indispensable/src/jvmTest/kotlin/at/asitplus/signum/ecmath/ECPointTest.kt
@@ -73,4 +73,4 @@ class ECPointTest : FreeSpec({
             shouldThrow<IllegalArgumentException> { ECPoint.fromUncompressed(curve, g.xBytes, byteArrayOf(0)) }
         }
     }
-})
+})