Add bytearray wrapper for tryParse and modify tests

Cach30verfl0w · Jun 14, 2024 · c0ca888 · c0ca888
1 parent f29baff
commit c0ca888
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 37 deletions.
diff --git a/kmp-advcrypto/src/linuxX64Main/kotlin/io/karma/advcrypto/linux/utils/KeyReaderHelper.kt b/kmp-advcrypto/src/linuxX64Main/kotlin/io/karma/advcrypto/linux/utils/KeyReaderHelper.kt
@@ -23,6 +23,8 @@ import io.karma.advcrypto.linux.keys.OpenSSLPKey
 import kotlinx.cinterop.ByteVar
 import kotlinx.cinterop.CPointer
 import kotlinx.cinterop.ExperimentalForeignApi
+import kotlinx.cinterop.addressOf
+import kotlinx.cinterop.usePinned
 import libssl.BIO
 import libssl.BIO_free
 import libssl.BIO_new
@@ -159,7 +161,7 @@ object KeyReaderHelper {
     }
 
     /**
-     * This method tries to parse the data in the specified pointer in a key. This method supports
+     * This method tries to parse the data of the specified pointer in a key. This method supports
      * PEM and DER. If no supported format worked, this method simply returns null.
      *
      * @author Cedric Hammes
@@ -182,4 +184,15 @@ object KeyReaderHelper {
         return null
     }
 
+    /**
+     * This method tries to parse the data of the specified array in a key. This method supports PEM
+     * and DER. If no supported format worked, this method simply returns null.
+     *
+     * @author Cedric Hammes
+     * @since  14/06/2024
+     */
+    fun tryParse(array: ByteArray, purposes: UByte): Key? = array.usePinned {
+        tryParse(it.addressOf(0), array.size.toULong(), purposes)
+    }
+
 }
diff --git a/kmp-advcrypto/src/linuxX64Test/kotlin/io/karma/advcrypto/linux/tests/KeyReaderHelperTests.kt b/kmp-advcrypto/src/linuxX64Test/kotlin/io/karma/advcrypto/linux/tests/KeyReaderHelperTests.kt
@@ -4,68 +4,50 @@ import io.karma.advcrypto.keys.Key
 import io.karma.advcrypto.keys.enum.KeyFormat
 import io.karma.advcrypto.keys.enum.KeyType
 import io.karma.advcrypto.linux.utils.KeyReaderHelper
-import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.addressOf
-import kotlinx.cinterop.usePinned
 import okio.FileSystem
 import okio.Path.Companion.toPath
 import kotlin.experimental.ExperimentalNativeApi
 import kotlin.test.Test
 
-@OptIn(ExperimentalForeignApi::class, ExperimentalNativeApi::class)
+@OptIn(ExperimentalNativeApi::class)
 class KeyReaderHelperTests {
     private val fileSystem = FileSystem.SYSTEM
 
     @Test
     fun testPEM() {
         fileSystem.read("./testkeys/rsa-private-key.pem".toPath()) {
-            val byteArray = readByteArray()
-            val size = byteArray.size.toULong()
-            byteArray.usePinned { array ->
-                val key = KeyReaderHelper.tryParse(array.addressOf(0), size, Key.PURPOSES_ALL)!!
-                assert(key.algorithm == "RSA")
-                assert(key.format == KeyFormat.PEM)
-                assert(key.type == KeyType.PRIVATE)
-            }
+            val key = KeyReaderHelper.tryParse(readByteArray(), Key.PURPOSES_ALL)!!
             close()
+            assert(key.algorithm == "RSA")
+            assert(key.format == KeyFormat.PEM)
+            assert(key.type == KeyType.PRIVATE)
         }
 
         fileSystem.read("./testkeys/rsa-public-key.pem".toPath()) {
-            val byteArray = readByteArray()
-            val size = byteArray.size.toULong()
-            byteArray.usePinned { array ->
-                val key = KeyReaderHelper.tryParse(array.addressOf(0), size, Key.PURPOSES_ALL)!!
-                assert(key.algorithm == "RSA")
-                assert(key.format == KeyFormat.PEM)
-                assert(key.type == KeyType.PUBLIC)
-            }
+            val key = KeyReaderHelper.tryParse(readByteArray(), Key.PURPOSES_ALL)!!
             close()
+            assert(key.algorithm == "RSA")
+            assert(key.format == KeyFormat.PEM)
+            assert(key.type == KeyType.PUBLIC)
         }
     }
 
     @Test
     fun testDER() {
         fileSystem.read("./testkeys/rsa-private-key.der".toPath()) {
-            val byteArray = readByteArray()
-            val size = byteArray.size.toULong()
-            byteArray.usePinned { array ->
-                val key = KeyReaderHelper.tryParse(array.addressOf(0), size, Key.PURPOSES_ALL)!!
-                assert(key.algorithm == "RSA")
-                assert(key.format == KeyFormat.DER)
-                assert(key.type == KeyType.PRIVATE)
-            }
+            val key = KeyReaderHelper.tryParse(readByteArray(), Key.PURPOSES_ALL)!!
             close()
+            assert(key.algorithm == "RSA")
+            assert(key.format == KeyFormat.DER)
+            assert(key.type == KeyType.PRIVATE)
         }
 
         fileSystem.read("./testkeys/rsa-public-key.der".toPath()) {
-            val byteArray = readByteArray()
-            val size = byteArray.size.toULong()
-            byteArray.usePinned { array ->
-                val key = KeyReaderHelper.tryParse(array.addressOf(0), size, Key.PURPOSES_ALL)!!
-                assert(key.algorithm == "RSA")
-                assert(key.format == KeyFormat.DER)
-                assert(key.type == KeyType.PUBLIC)
-            }
+            val key = KeyReaderHelper.tryParse(readByteArray(), Key.PURPOSES_ALL)!!
+            close()
+            assert(key.algorithm == "RSA")
+            assert(key.format == KeyFormat.DER)
+            assert(key.type == KeyType.PUBLIC)
             close()
         }
     }