From 5fce9f53c4c2cfb41926d273b86313478aed0664 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Thu, 20 Jun 2019 22:26:23 +0200 Subject: Fixed decrypting encoding bugs Co-authored-by: LarsVomMars --- src/main/kotlin/CryptoHandler.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/kotlin/CryptoHandler.kt') diff --git a/src/main/kotlin/CryptoHandler.kt b/src/main/kotlin/CryptoHandler.kt index 03396f2..145f3e6 100644 --- a/src/main/kotlin/CryptoHandler.kt +++ b/src/main/kotlin/CryptoHandler.kt @@ -10,24 +10,25 @@ internal constructor(private val secretKey: SecretKey, cipher: String) { private val cipher: Cipher = Cipher.getInstance(cipher) @Throws(InvalidKeyException::class, IOException::class) - internal fun encrypt(content: String, fileName: String): ByteArray { + internal fun encrypt(content: String, fileName: String) { cipher.init(Cipher.ENCRYPT_MODE, secretKey) - val iv: ByteArray = cipher.iv + val iv = cipher.iv FileOutputStream(fileName).use { fileOut -> + fileOut.write(iv) CipherOutputStream(fileOut, cipher).use { cipherOut -> cipherOut.write(content.toByteArray()) } } - - return iv } @Throws(InvalidAlgorithmParameterException::class, InvalidKeyException::class, IOException::class) - internal fun decrypt(fileName: String, iv: ByteArray): String { + internal fun decrypt(fileName: String): String { var content = "" FileInputStream(fileName).use { fileIn -> + val iv = ByteArray(16) + fileIn.read(iv) cipher.init(Cipher.DECRYPT_MODE, secretKey, IvParameterSpec(iv)) CipherInputStream(fileIn, cipher).use { cipherIn -> @@ -45,6 +46,6 @@ internal constructor(private val secretKey: SecretKey, cipher: String) { } } - return content + return content // TODO: Fix char handling as 1 byte in decryption } } -- cgit v1.2.3