fix: use correct base encoding with JWK (#6)

* fix: use correct base encoding with JWK * fix: remove workaround for base64 decoding * enhancements: update invalid key size error message
input-output-hk · Apr 25, 2023 · fd26f49 · fd26f49
1 parent 6665c8b
commit fd26f49
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,7 @@ buildscript {
 }
 
 allprojects {
-    version = "1.0.2-alpha"
+    version = "1.0.3-alpha"
     group = "io.iohk.atala.prism.didcomm"
 
     repositories {

diff --git a/didcomm/didcomm.podspec b/didcomm/didcomm.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'didcomm'
-    spec.version                  = '1.0.2-alpha'
+    spec.version                  = '1.0.3-alpha'
     spec.homepage                 = ''
     spec.source                   = { :http=> ''}
     spec.authors                  = 'IOG'

diff --git a/didpeer/didpeer.podspec b/didpeer/didpeer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'didpeer'
-    spec.version                  = '1.0.2-alpha'
+    spec.version                  = '1.0.3-alpha'
     spec.homepage                 = ''
     spec.source                   = { :http=> ''}
     spec.authors                  = 'IOG'

diff --git a/didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/core/JWK_OKP.kt b/didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/core/JWK_OKP.kt
@@ -1,7 +1,7 @@
 package io.iohk.atala.prism.didcomm.didpeer.core
 
+import io.iohk.atala.prism.apollo.base64.base64UrlDecodedBytes
 import io.iohk.atala.prism.apollo.base64.base64UrlEncoded
-import io.iohk.atala.prism.apollo.base64.base64UrlPadDecodedBytes
 import io.iohk.atala.prism.didcomm.didpeer.VerificationMaterialPeerDID
 import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAgreement
 import io.iohk.atala.prism.didcomm.didpeer.VerificationMethodTypeAuthentication
@@ -39,9 +39,9 @@ fun fromJwk(verMaterial: VerificationMaterialPeerDID<out VerificationMethodTypeP
     // Base64.decodeBase64(value) // this line in JVM handle both Base64 Standard & Base64 URL
     // The following if condition is a workaround for a bug in Apollo Base64URLPad decoding which will be
     // fixed in the next release
-    var decoded = value.base64UrlPadDecodedBytes
-    if (decoded.isNotEmpty() && decoded.last().toInt() == 0) {
-        decoded = decoded.dropLast(1).toByteArray()
-    }
-    return decoded
+//    var decoded = value.base64UrlDecodedBytes
+//    if (decoded.isNotEmpty() && decoded.last().toInt() == 0) {
+//        decoded = decoded.dropLast(1).toByteArray()
+//    }
+    return value.base64UrlDecodedBytes
 }
diff --git a/didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/core/Validation.kt b/didpeer/src/commonMain/kotlin/io.iohk.atala.prism.didcomm.didpeer/core/Validation.kt
@@ -29,5 +29,5 @@ internal fun validateJson(value: String) {
 internal fun validateRawKeyLength(key: ByteArray) {
     // for all supported key types now (ED25519 and X25510) the expected size is 32
     if (key.size != 32)
-        throw IllegalArgumentException("Invalid key $key")
+        throw IllegalArgumentException("Invalid key $key, size should be 32 and it is: ${key.size}")
 }