From 49fe1d07434cf3cc17a53a32007bc9f6424df8ea Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 24 Jul 2023 16:28:41 -0400 Subject: [PATCH] Fixes bug with Base64 encoding --- .../java/com/vitorpamplona/amethyst/service/CryptoUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/CryptoUtils.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/CryptoUtils.kt index 791fc65f0..1a6cb3971 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/service/CryptoUtils.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/service/CryptoUtils.kt @@ -38,9 +38,9 @@ object CryptoUtils { random.nextBytes(iv) val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding") cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(sharedSecret, "AES"), IvParameterSpec(iv)) - val ivBase64 = Base64.getEncoder().encode(iv) + val ivBase64 = Base64.getEncoder().encodeToString(iv) val encryptedMsg = cipher.doFinal(msg.toByteArray()) - val encryptedMsgBase64 = Base64.getEncoder().encode(encryptedMsg) + val encryptedMsgBase64 = Base64.getEncoder().encodeToString(encryptedMsg) return "$encryptedMsgBase64?iv=$ivBase64" }