From 9898e5210fb275f1fdd11a8287be673becb78073 Mon Sep 17 00:00:00 2001
From: Hivert Quentin <quentin.hivert.fr@gmail.com>
Date: Tue, 6 Feb 2024 18:06:51 +0100
Subject: [PATCH] feat(accounts): Add parameter to encrypt/decrypt auxiliary
 account's password

---
 SoObjects/SOGo/NSString+Crypto.m | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SoObjects/SOGo/NSString+Crypto.m b/SoObjects/SOGo/NSString+Crypto.m
index 4ec06093d..fa66e3a94 100644
--- a/SoObjects/SOGo/NSString+Crypto.m
+++ b/SoObjects/SOGo/NSString+Crypto.m
@@ -618,8 +618,8 @@ static const NSString *kAES256GCMError = @"kAES256GCMError";
   #ifdef HAVE_OPENSSL
 
     keyData = [passwordScheme dataUsingEncoding: NSUTF8StringEncoding];
-    ivData = [[NSData alloc] initWithBase64EncodedString: ivString options:0];
-    tagData = [[NSData alloc] initWithBase64EncodedString: tagString options:0];
+    ivData = [ivString dataByDecodingBase64];
+    tagData = [tagString dataByDecodingBase64];
 
     if (AES_256_KEY_SIZE != [keyData length]) {
       *ex = [NSException exceptionWithName: kAES256GCMError reason: [NSString stringWithFormat:@"Key must be %d bits", (AES_256_KEY_SIZE * 8)] userInfo: nil];
@@ -635,7 +635,7 @@ static const NSString *kAES256GCMError = @"kAES256GCMError";
     }
 
     inputString = [NSString stringWithString: self];
-    data = [[NSData alloc] initWithBase64EncodedString: inputString options:0];
+    data = [inputString dataByDecodingBase64];
 
     // Initialize OpenSSL
     EVP_CIPHER_CTX *ctx;