narayana/conversations-classic-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

aes-gsm for attachments

Browse source
This commit is contained in:
fmodf 2024-09-08 19:28:17 +02:00
parent 4399b81ec8
commit bfd9757a37
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ConversationsClassic/AppData/Client/Client.swift
View file

@ -115,7 +115,16 @@ extension Client {
}
// encrypt data if needed
let ((key, iv), encrypted) = try await encryptFile(data)
let key = try AESGSMEngine.generateKey()
let iv = try AESGSMEngine.generateIV()
var encrypted = Data()
var tag = Data()
guard AESGSMEngine.shared.encrypt(iv: iv, key: key, message: data, output: &encrypted, tag: &tag) else {
throw AppError.securityError
}
// attach tag to end of encrypted data
encrypted.append(tag)
data = encrypted
// upload
@ -192,19 +201,6 @@ private extension Client {
})
}
}
func encryptFile(_ data: Data) async throws -> ((Data, Data), Data) {
guard let iv = try? AESGSMEngine.generateIV(), let key = try? AESGSMEngine.generateKey() else {
throw AppError.securityError
}
var encrypted = Data()
var tag = Data()
guard AESGSMEngine.shared.encrypt(iv: iv, key: key, message: data, output: &encrypted, tag: &tag) else {
throw AppError.securityError
}
return ((key, iv), encrypted)
}
}
extension Client {

4
ConversationsClassic/AppData/Services/AESGSMEngine.swift
View file

@ -12,8 +12,8 @@ final class AESGSMEngine: AES_GCM_Engine {
let symmetricKey = SymmetricKey(data: key)
let sealedBox = try AES.GCM.seal(message, using: symmetricKey, nonce: AES.GCM.Nonce(data: iv))
if let output = output, let data = sealedBox.combined {
output.pointee = data
if let output = output {
output.pointee = sealedBox.ciphertext
}
if let tag = tag {
tag.pointee = sealedBox.tag