Re-enable API key encryption. Bump version.

helikon-labs · Jan 22, 2024 · fb045c8 · fb045c8
1 parent 77ca464
commit fb045c8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ information.
     ```gradle
     dependencies {
         // ...
-        implementation 'com.github.helikon-labs:subvt-data-android:0.22.1'
+        implementation 'com.github.helikon-labs:subvt-data-android:0.22.2'
         // ...
     }
     ```

diff --git a/subvt-data/build.gradle b/subvt-data/build.gradle
@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionCode 221
-        versionName "0.22.1"
+        versionCode 222
+        versionName "0.22.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/subvt-data/src/main/java/io/helikon/subvt/data/service/auth/AuthUtil.kt b/subvt-data/src/main/java/io/helikon/subvt/data/service/auth/AuthUtil.kt
@@ -13,9 +13,11 @@ import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.math.BigInteger
 import java.security.KeyPairGenerator
+import java.security.KeyStore
 import java.util.Calendar
 import javax.crypto.Cipher
 import javax.crypto.CipherInputStream
+import javax.crypto.CipherOutputStream
 import javax.security.auth.x500.X500Principal
 
 const val COMMS_KEY_ALIAS = "SubVTCommsKey"
@@ -82,14 +84,14 @@ private fun getPublicKeyEncryptedFilePath(context: Context): String {
 
 private fun getCipherInstance() =
     Cipher.getInstance(
-        "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
+        // "RSA/ECB/OAEPWithSHA-256AndMGF1Padding",
+        "AES/CBC/PKCS5Padding",
     )
 
 internal fun storeKeyPair(
     context: Context,
     keyPair: ECKeyPair,
 ) {
-    /*
     val keyStore = KeyStore.getInstance("AndroidKeyStore")
     keyStore.load(null)
     if (!keyStore.containsAlias(COMMS_KEY_ALIAS)) {
@@ -112,15 +114,17 @@ internal fun storeKeyPair(
         )
     cipherOutputStream.write(keyPair.publicKey.toByteArray())
     cipherOutputStream.close()
+
+    /*
+     val privateKeyStream = FileOutputStream(getPrivateKeyEncryptedFilePath(context))
+     privateKeyStream.write(keyPair.privateKey.toByteArray())
+     privateKeyStream.flush()
+     privateKeyStream.close()
+     val publicKeyStream = FileOutputStream(getPublicKeyEncryptedFilePath(context))
+     publicKeyStream.write(keyPair.publicKey.toByteArray())
+     publicKeyStream.flush()
+     publicKeyStream.close()
      */
-    val privateKeyStream = FileOutputStream(getPrivateKeyEncryptedFilePath(context))
-    privateKeyStream.write(keyPair.privateKey.toByteArray())
-    privateKeyStream.flush()
-    privateKeyStream.close()
-    val publicKeyStream = FileOutputStream(getPublicKeyEncryptedFilePath(context))
-    publicKeyStream.write(keyPair.publicKey.toByteArray())
-    publicKeyStream.flush()
-    publicKeyStream.close()
 }
 
 private fun getFileBytes(path: String): ByteArray {
@@ -160,7 +164,6 @@ internal fun getKeyPair(context: Context): ECKeyPair? {
     if (!File(getPrivateKeyEncryptedFilePath(context)).exists()) {
         return null
     }
-    /*
     val keyStore = KeyStore.getInstance("AndroidKeyStore")
     keyStore.load(null)
     val entry = keyStore.getEntry(COMMS_KEY_ALIAS, null) as KeyStore.PrivateKeyEntry
@@ -171,8 +174,10 @@ internal fun getKeyPair(context: Context): ECKeyPair? {
     outCipher2.init(Cipher.DECRYPT_MODE, entry.privateKey)
     val publicKeyBytes = getEncryptedFileBytes(getPublicKeyEncryptedFilePath(context), outCipher2)
     return ECKeyPair(BigInteger(privateKeyBytes), BigInteger(publicKeyBytes))
-     */
+
+    /*
     val privateKeyBytes = getFileBytes(getPrivateKeyEncryptedFilePath(context))
     val publicKeyBytes = getFileBytes(getPublicKeyEncryptedFilePath(context))
     return ECKeyPair(BigInteger(privateKeyBytes), BigInteger(publicKeyBytes))
+     */
 }