Remove padding from base64 encoded iv value

This uses the existing `MXBase64Tools` to trim the `=` padding from the base64 encoded string. The reinsertion of the padding prior to decoding was already implemented (line 224 in the same file). Closes: element-hq/element-ios#4172 Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
Johennes · Apr 1, 2021 · 3c7cb0b · 3c7cb0b
1 parent 6814ebb
commit 3c7cb0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,7 +8,7 @@ Changes to be released in next version
  * 
 
 🐛 Bugfix
- * 
+ * Remove padding from base64 encoded `iv` value (vector-im/element-ios/issues/4172).
 
 ⚠️ API Changes
  * 

diff --git a/MatrixSDK/Crypto/Data/MXEncryptedAttachments.m b/MatrixSDK/Crypto/Data/MXEncryptedAttachments.m
@@ -170,7 +170,7 @@ + (void)encryptAttachment:(MXMediaLoader *)uploader
         encryptedContentFile.url = url;
         encryptedContentFile.mimetype = mimeType;
         encryptedContentFile.key = encryptedContentKey;
-        encryptedContentFile.iv = [iv base64EncodedStringWithOptions:0];
+        encryptedContentFile.iv = [MXBase64Tools base64ToUnpaddedBase64:[iv base64EncodedStringWithOptions:0]];
         encryptedContentFile.hashes = @{
                                         @"sha256": [MXBase64Tools base64ToUnpaddedBase64:[computedSha256 base64EncodedStringWithOptions:0]],
                                         };