Merge branch 'release/0.2.1'

README.md

@@ -25,7 +25,7 @@ allprojects {
 
 In your application `build.gradle`:
 ```groovy
-def uport_sdk_version = "v0.2.0"
+def uport_sdk_version = "v0.2.1"
 dependencies {
     ...
     // core SDK
@@ -140,6 +140,9 @@ but that may be removed when pure kotlin implementations of the required cryptog
 
 ### Changelog
 
+* 0.2.1
+    * bugfix: crash when decrypting fingerprint protected seed
+
 * 0.2.0
     * add `:ethr-did` module with support for [resolving `ethr-did`s](https://github.com/uport-project/ethr-did-resolver) 
     * move [uport-android-signer](https://github.com/uport-project/uport-android-signer) into this SDK as `:signer` module

build.gradle

@@ -33,7 +33,7 @@ buildscript {
         kethereum_version = "0.53"
         khex_version = "0.5"
 
-        uport_sdk_version = "0.2.0"
+        uport_sdk_version = "0.2.1"
     }
 
     repositories {

signer/src/main/java/com/uport/sdk/signer/encryption/FingerprintAsymmetricProtection.kt

@@ -43,7 +43,7 @@ class FingerprintAsymmetricProtection : KeyProtection() {
     fun decrypt(context: Context, purpose: String, ciphertext: String, callback: DecryptionCallback) {
 
         try {
-            val (encryptedBytes) = unpackCiphertext(ciphertext)
+            val (_, encryptedBytes) = unpackCiphertext(ciphertext)
 
             val cipher = getWrappingCipher(Cipher.DECRYPT_MODE, alias)
 

signer/src/test/java/com/uport/sdk/signer/ExtensionsKtTest.kt

@@ -0,0 +1,34 @@
+package com.uport.sdk.signer
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+class ExtensionsKtTest {
+
+    @Test
+    fun `can pack ciphertext and iv`() {
+        val data = listOf("iv", "cipher").map { it.toByteArray() }.toTypedArray()
+        val packed = packCiphertext(*data)
+        val (iv, cipher) = unpackCiphertext(packed)
+        assertEquals("cipher", String(cipher))
+        assertEquals("iv", String(iv))
+    }
+
+    @Test
+    fun `can pack empty iv and ciphertext`() {
+        val data = arrayOf(byteArrayOf(), "cipher".toByteArray())
+        val packed = packCiphertext(*data)
+        val (iv, cipher) = unpackCiphertext(packed)
+        assertEquals("cipher", String(cipher))
+        assertEquals("", String(iv))
+    }
+
+    @Test
+    fun `can pack only ciphertext`() {
+        val data = arrayOf("cipher".toByteArray())
+        val packed = packCiphertext(*data)
+        val (cipher) = unpackCiphertext(packed)
+        assertEquals("cipher", String(cipher))
+    }
+}