Merge branch 'release/0.27.17/master'

Author: pixlwave

CHANGES.md

@@ -1,3 +1,8 @@
+## Changes in 0.27.17 (2024-12-10)
+
+No significant changes.
+
+
 ## Changes in 0.27.16 (2024-11-12)
 
 No significant changes.

Gemfile.lock

@@ -275,7 +275,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    webrick (1.9.0)
     word_wrap (1.0.0)
     xcode-install (2.8.1)
       claide (>= 0.9.1)

MatrixSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.27.16"
+  s.version      = "0.27.17"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

MatrixSDK/Crypto/SecretStorage/MXSecretStorage.m

@@ -18,12 +18,14 @@
 
 #import "MXSession.h"
 #import "MXTools.h"
+#import "MXKeyBackupPassword.h"
 #import "MXRecoveryKey.h"
 #import "MXHkdfSha256.h"
 #import "MXAesHmacSha2.h"
 #import "MXBase64Tools.h"
 #import "MXEncryptedSecretContent.h"
 
+#import <Security/Security.h>
 
 #pragma mark - Constants
 
@@ -126,6 +128,112 @@ - (MXHTTPOperation*)createKeyWithKeyId:(nullable NSString*)keyId
     return operation;
 }
 
+- (MXHTTPOperation*)createKeyWithKeyId:(nullable NSString*)keyId
+                               keyName:(nullable NSString*)keyName
+                            passphrase:(nullable NSString*)passphrase
+                               success:(void (^)(MXSecretStorageKeyCreationInfo *keyCreationInfo))success
+                               failure:(void (^)(NSError *error))failure
+{
+    MXLogDebug(@"[MXSecretStorage] createKeyWithKeyId: Creating new key with passphrase");
+    keyId = keyId ?: [[NSUUID UUID] UUIDString];
+    
+    MXHTTPOperation *operation = [MXHTTPOperation new];
+    
+    MXWeakify(self);
+    dispatch_async(processingQueue, ^{
+        MXStrongifyAndReturnIfNil(self);
+        
+        NSError *error;
+        
+        NSData *privateKey;
+        MXSecretStoragePassphrase *passphraseInfo;
+        
+        if (passphrase)
+        {
+            // Generate a private key from the passphrase
+            NSString *salt;
+            NSUInteger iterations;
+            privateKey = [MXKeyBackupPassword generatePrivateKeyWithPassword:passphrase
+                                                                        salt:&salt
+                                                                  iterations:&iterations
+                                                                       error:&error];
+            if (!error)
+            {
+                passphraseInfo = [MXSecretStoragePassphrase new];
+                passphraseInfo.algorithm = @"m.pbkdf2";
+                passphraseInfo.salt = salt;
+                passphraseInfo.iterations = iterations;
+            }
+        }
+        else
+        {
+            uint8_t randomBytes[32];
+            OSStatus status = SecRandomCopyBytes(kSecRandomDefault, sizeof(randomBytes), randomBytes);
+            
+            if (status == errSecSuccess)
+            {
+                privateKey = [NSData dataWithBytes:randomBytes length:sizeof(randomBytes)];
+            }
+            else
+            {
+                MXLogDebug(@"Failed to generate random bytes with error: %d", (int)status);
+            }
+        }
+        
+        if (error)
+        {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                MXLogDebug(@"[MXSecretStorage] createKeyWithKeyId: Failed to create a new key - %@", error);
+                failure(error);
+            });
+            return;
+        }
+        
+        // Build iv and mac
+        MXEncryptedSecretContent *encryptedZeroString = [self encryptedZeroStringWithPrivateKey:privateKey iv:nil error:&error];
+        if (error)
+        {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                MXLogDebug(@"[MXSecretStorage] createKeyWithKeyId: Failed to create a new key - %@", error);
+                failure(error);
+            });
+            return;
+        }
+        
+        MXSecretStorageKeyContent *ssssKeyContent = [MXSecretStorageKeyContent new];
+        ssssKeyContent.name = keyName;
+        ssssKeyContent.algorithm = MXSecretStorageKeyAlgorithm.aesHmacSha2;
+        ssssKeyContent.passphrase = passphraseInfo;
+        ssssKeyContent.iv = encryptedZeroString.iv;
+        ssssKeyContent.mac = encryptedZeroString.mac;
+        
+        NSString *accountDataId = [self storageKeyIdForKey:keyId];
+        MXHTTPOperation *operation2 = [self setAccountData:ssssKeyContent.JSONDictionary forType:accountDataId success:^{
+            
+            MXSecretStorageKeyCreationInfo *keyCreationInfo = [MXSecretStorageKeyCreationInfo new];
+            keyCreationInfo.keyId = keyId;
+            keyCreationInfo.content = ssssKeyContent;
+            keyCreationInfo.privateKey = privateKey;
+            keyCreationInfo.recoveryKey = [MXRecoveryKey encode:privateKey];
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                MXLogDebug(@"[MXSecretStorage] createKeyWithKeyId: Successfully created a new key");
+                success(keyCreationInfo);
+            });
+            
+        } failure:^(NSError *error) {
+            dispatch_async(dispatch_get_main_queue(), ^{
+                MXLogDebug(@"[MXSecretStorage] createKeyWithKeyId: Failed to create a new key - %@", error);
+                failure(error);
+            });
+        }];
+        
+        [operation mutateTo:operation2];
+    });
+    
+    return operation;
+}
+
 - (MXHTTPOperation*)deleteKeyWithKeyId:(nullable NSString*)keyId
                                success:(void (^)(void))success
                                failure:(void (^)(NSError *error))failure

MatrixSDK/MXRestClient.m

@@ -3103,7 +3103,7 @@ -(MXHTTPOperation *)reportRoom:(NSString *)roomId
                        success:(void (^)(void))success
                        failure:(void (^)(NSError *))failure
 {
-    NSString *path = [NSString stringWithFormat:@"%@/org.matrix.msc4151/rooms/%@/report", kMXAPIPrefixPathUnstable, roomId];
+    NSString *path = [NSString stringWithFormat:@"%@/rooms/%@/report", kMXAPIPrefixPathV3, roomId];
 
     NSDictionary *parameters = @{ @"reason": reason.length > 0 ? reason : @"" };
 

MatrixSDK/MatrixSDKVersion.m

@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.27.16";
+NSString *const MatrixSDKVersion = @"0.27.17";

Podfile.lock

@@ -65,4 +65,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: a2fe7b4dcd95b04f52989dc47cded48c782c02a4
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3