fix: bugs found while integrating apollo with KMP SDK (#98)

Signed-off-by: Ahmed Moussa <[email protected]> Co-authored-by: Ahmed Moussa <[email protected]>
hyperledger · Oct 2, 2023 · de71265 · de71265
1 parent 648bcdd
commit de71265
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 38 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,6 +1,8 @@
 root = true
 
 [*.{kt,kts}]
+ktlint_code_style = ktlint_official
 ktlint_standard_no_semi = disabled
 ktlint_standard_trailing-comma-on-call-site = disabled
 ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_function-signature = disabled
diff --git a/.github/workflows/Deployment.yml b/.github/workflows/Deployment.yml
@@ -1,3 +1,5 @@
+---
+# kics-scan ignore
 name: Deployment
 
 defaults:

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -1,3 +1,5 @@
+---
+# kics-scan ignore
 name: Pull Request CI
 
 defaults:
@@ -37,10 +39,10 @@ jobs:
 
       - name: Mega-Linter
         id: ml
-        uses: megalinter/megalinter@v6
+        uses: oxsecurity/megalinter@v7.4.0
 
       - name: Archive production artifacts
-        if: success() || failure()
+        if: ${{ success() || failure() }}
         uses: actions/upload-artifact@v3
         with:
           name: Mega-Linter reports

diff --git a/.mega-linter.yml b/.mega-linter.yml
@@ -1,3 +1,4 @@
+---
 APPLY_FIXES: none
 FILTER_REGEX_EXCLUDE: (karma.config.js|polyfill.js|timeout.js)
 VALIDATE_ALL_CODEBASE: true
@@ -11,3 +12,10 @@ DISABLE_LINTERS:
   - BASH_SHELLCHECK
   - BASH_EXEC
   - REPOSITORY_TRIVY
+  - REPOSITORY_TRUFFLEHOG
+  - REPOSITORY_KICS
+
+DISABLE_ERRORS_LINTERS:
+  - REPOSITORY_TRUFFLEHOG
+  - REPOSITORY_TRIVY
+  - REPOSITORY_KICS
diff --git a/...metric-encryption/src/androidMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMEdKeyPair.kt b/...metric-encryption/src/androidMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMEdKeyPair.kt
@@ -1,18 +1,23 @@
 package io.iohk.atala.prism.apollo.utils
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.KeyPair
-import java.security.KeyPairGenerator
+import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator
+import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters
+import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters
+import java.security.SecureRandom
 
-actual class KMMEdKeyPair actual constructor(actual val privateKey: KMMEdPrivateKey, actual val publicKey: KMMEdPublicKey) {
+actual class KMMEdKeyPair actual constructor(
+    actual val privateKey: KMMEdPrivateKey,
+    actual val publicKey: KMMEdPublicKey
+) {
     actual companion object : Ed25519KeyPairGeneration {
         override fun generateKeyPair(): KMMEdKeyPair {
-            val provider = BouncyCastleProvider()
-            val generator = KeyPairGenerator.getInstance("Ed25519", provider)
-            val javaKeyPair: KeyPair = generator.generateKeyPair()
+            val generator = Ed25519KeyPairGenerator()
+            generator.init(Ed25519KeyGenerationParameters(SecureRandom()))
+            val pair = generator.generateKeyPair()
             return KMMEdKeyPair(
-                KMMEdPrivateKey(javaKeyPair.private.encoded),
-                KMMEdPublicKey(javaKeyPair.public.encoded)
+                privateKey = KMMEdPrivateKey((pair.private as Ed25519PrivateKeyParameters).encoded),
+                publicKey = KMMEdPublicKey((pair.public as Ed25519PublicKeyParameters).encoded),
             )
         }
     }

diff --git a/...ic-encryption/src/androidMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMX25519KeyPair.kt b/...ic-encryption/src/androidMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMX25519KeyPair.kt
@@ -1,22 +1,24 @@
 package io.iohk.atala.prism.apollo.utils
 
-import org.bouncycastle.jcajce.spec.XDHParameterSpec
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.KeyPairGenerator
+import org.bouncycastle.crypto.generators.X25519KeyPairGenerator
+import org.bouncycastle.crypto.params.X25519KeyGenerationParameters
+import org.bouncycastle.crypto.params.X25519PrivateKeyParameters
+import org.bouncycastle.crypto.params.X25519PublicKeyParameters
+import java.security.SecureRandom
 
 actual class KMMX25519KeyPair actual constructor(
     actual val privateKey: KMMX25519PrivateKey,
     actual val publicKey: KMMX25519PublicKey
 ) {
     actual companion object : X25519KeyPairGeneration {
         override fun generateKeyPair(): KMMX25519KeyPair {
-            val provider = BouncyCastleProvider()
-            val kpg = KeyPairGenerator.getInstance("X25519", provider)
-            kpg.initialize(XDHParameterSpec(XDHParameterSpec.X25519))
-            val javaKeyPair = kpg.generateKeyPair()
+            val generator = X25519KeyPairGenerator()
+            generator.init(X25519KeyGenerationParameters(SecureRandom()))
+            val keyPair = generator.generateKeyPair()
+
             return KMMX25519KeyPair(
-                KMMX25519PrivateKey(javaKeyPair.private.encoded),
-                KMMX25519PublicKey(javaKeyPair.public.encoded)
+                KMMX25519PrivateKey((keyPair.private as X25519PrivateKeyParameters).encoded),
+                KMMX25519PublicKey((keyPair.public as X25519PublicKeyParameters).encoded)
             )
         }
     }

diff --git a/...asymmetric-encryption/src/jvmMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMEdKeyPair.kt b/...asymmetric-encryption/src/jvmMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMEdKeyPair.kt
@@ -1,18 +1,23 @@
 package io.iohk.atala.prism.apollo.utils
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.KeyPair
-import java.security.KeyPairGenerator
+import org.bouncycastle.crypto.generators.Ed25519KeyPairGenerator
+import org.bouncycastle.crypto.params.Ed25519KeyGenerationParameters
+import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters
+import org.bouncycastle.crypto.params.Ed25519PublicKeyParameters
+import java.security.SecureRandom
 
-actual class KMMEdKeyPair actual constructor(actual val privateKey: KMMEdPrivateKey, actual val publicKey: KMMEdPublicKey) {
+actual class KMMEdKeyPair actual constructor(
+    actual val privateKey: KMMEdPrivateKey,
+    actual val publicKey: KMMEdPublicKey
+) {
     actual companion object : Ed25519KeyPairGeneration {
         override fun generateKeyPair(): KMMEdKeyPair {
-            val provider = BouncyCastleProvider()
-            val generator = KeyPairGenerator.getInstance("Ed25519", provider)
-            val javaKeyPair: KeyPair = generator.generateKeyPair()
+            val generator = Ed25519KeyPairGenerator()
+            generator.init(Ed25519KeyGenerationParameters(SecureRandom()))
+            val pair = generator.generateKeyPair()
             return KMMEdKeyPair(
-                KMMEdPrivateKey(javaKeyPair.private.encoded),
-                KMMEdPublicKey(javaKeyPair.public.encoded)
+                privateKey = KMMEdPrivateKey((pair.private as Ed25519PrivateKeyParameters).encoded),
+                publicKey = KMMEdPublicKey((pair.public as Ed25519PublicKeyParameters).encoded),
             )
         }
     }

diff --git a/...metric-encryption/src/jvmMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMX25519KeyPair.kt b/...metric-encryption/src/jvmMain/kotlin/io/iohk/atala/prism/apollo/utils/KMMX25519KeyPair.kt
@@ -1,22 +1,24 @@
 package io.iohk.atala.prism.apollo.utils
 
-import org.bouncycastle.jcajce.spec.XDHParameterSpec
-import org.bouncycastle.jce.provider.BouncyCastleProvider
-import java.security.KeyPairGenerator
+import org.bouncycastle.crypto.generators.X25519KeyPairGenerator
+import org.bouncycastle.crypto.params.X25519KeyGenerationParameters
+import org.bouncycastle.crypto.params.X25519PrivateKeyParameters
+import org.bouncycastle.crypto.params.X25519PublicKeyParameters
+import java.security.SecureRandom
 
 actual class KMMX25519KeyPair actual constructor(
     actual val privateKey: KMMX25519PrivateKey,
     actual val publicKey: KMMX25519PublicKey
 ) {
     actual companion object : X25519KeyPairGeneration {
         override fun generateKeyPair(): KMMX25519KeyPair {
-            val provider = BouncyCastleProvider()
-            val kpg = KeyPairGenerator.getInstance("X25519", provider)
-            kpg.initialize(XDHParameterSpec(XDHParameterSpec.X25519))
-            val javaKeyPair = kpg.generateKeyPair()
+            val generator = X25519KeyPairGenerator()
+            generator.init(X25519KeyGenerationParameters(SecureRandom()))
+            val keyPair = generator.generateKeyPair()
+
             return KMMX25519KeyPair(
-                KMMX25519PrivateKey(javaKeyPair.private.encoded),
-                KMMX25519PublicKey(javaKeyPair.public.encoded)
+                KMMX25519PrivateKey((keyPair.private as X25519PrivateKeyParameters).encoded),
+                KMMX25519PublicKey((keyPair.public as X25519PublicKeyParameters).encoded)
             )
         }
     }