Merge pull request #17 from contentpass/CHORE-android-8-corrupt-keystore-entry

Handle corrupt KeyStore entry on Android 8

Author: 0x7f

README.md

@@ -14,7 +14,7 @@
 Our SDK is available on Maven Central.
 
 ```groovy
-implementation 'de.contentpass:contentpass-android:2.2.6'
+implementation 'de.contentpass:contentpass-android:2.2.7'
 ```
 
 Add this to your app's `build.gradle` file's `dependencies` element.

lib/build.gradle.kts

@@ -58,7 +58,7 @@ kapt {
 extra.apply{
     set("PUBLISH_GROUP_ID", "de.contentpass")
     set("PUBLISH_ARTIFACT_ID", "contentpass-android")
-    set("PUBLISH_VERSION", "2.2.6")
+    set("PUBLISH_VERSION", "2.2.7")
 }
 
 apply("${rootProject.projectDir}/scripts/publish-module.gradle")

lib/src/main/java/de/contentpass/lib/KeyStore.kt

@@ -50,7 +50,16 @@ internal class KeyStore(private val context: Context, private val propertyId: St
         if (!keystore.containsAlias(keyPairAlias)) {
             createKeyPair()
         }
-        val pair = keystore.getEntry(keyPairAlias, null) as VendorKeyStore.PrivateKeyEntry
+        val pair = try {
+            keystore.getEntry(keyPairAlias, null) as? VendorKeyStore.PrivateKeyEntry
+        } catch (e: Exception) {
+            null
+        } ?: run {
+            // Android 8 can throw when the entry is invalidated/corrupted; recreate it.
+            keystore.deleteEntry(keyPairAlias)
+            createKeyPair()
+            keystore.getEntry(keyPairAlias, null) as VendorKeyStore.PrivateKeyEntry
+        }
         privateKey = pair.privateKey
         publicKey = pair.certificate.publicKey
     }