v2.0.6(126)

fix bug login Filen.io with non-ASCII password

Author: lithium0003

CryptCloudViewer/CryptCloudViewer.xcodeproj/project.pbxproj

@@ -325,7 +325,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = CryptCloudViewer/CryptCloudViewer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 126;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7A9X38B4YU;
 				ENABLE_APP_SANDBOX = YES;
@@ -354,7 +354,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = info.lithium03.ccViewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;
@@ -384,7 +384,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = CryptCloudViewer/CryptCloudViewer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 124;
+				CURRENT_PROJECT_VERSION = 126;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 7A9X38B4YU;
 				ENABLE_APP_SANDBOX = YES;
@@ -413,7 +413,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 26.0;
-				MARKETING_VERSION = 2.0.5;
+				MARKETING_VERSION = 2.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = info.lithium03.ccViewer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				REGISTER_APP_GROUPS = YES;

RemoteCloud/RemoteCloud/Storages/FilenStorage.swift

@@ -205,21 +205,24 @@ public class FilenStorage: NetworkStorage, URLSessionDataDelegate {
     }
 
     func pbkdf2(password: String, salt: Data, iterations: UInt32) -> Data {
+        let passwordUtf8 = password.data(using: .utf8)!
         let saltBuffer = [UInt8](salt)
         let hashedLen = Int(CC_SHA512_DIGEST_LENGTH)
         var hashed = Data(count: hashedLen)
 
         let result = hashed.withUnsafeMutableBytes { (body: UnsafeMutableRawBufferPointer) -> Int32 in
-            if let baseAddress = body.baseAddress, body.count > 0 {
-                let data = baseAddress.assumingMemoryBound(to: UInt8.self)
-                return CCKeyDerivationPBKDF(CCPBKDFAlgorithm(kCCPBKDF2),
-                                            password, password.count,
-                                            saltBuffer, saltBuffer.count,
-                                            CCPseudoRandomAlgorithm(kCCPRFHmacAlgSHA512),
-                                            iterations,
-                                            data, hashedLen)
+            return passwordUtf8.withUnsafeBytes { pass in
+                if let baseAddress = body.baseAddress, body.count > 0 {
+                    let data = baseAddress.assumingMemoryBound(to: UInt8.self)
+                    return CCKeyDerivationPBKDF(CCPBKDFAlgorithm(kCCPBKDF2),
+                                                pass.baseAddress!, passwordUtf8.count,
+                                                saltBuffer, saltBuffer.count,
+                                                CCPseudoRandomAlgorithm(kCCPRFHmacAlgSHA512),
+                                                iterations,
+                                                data, hashedLen)
+                }
+                return Int32(kCCMemoryFailure)
             }
-            return Int32(kCCMemoryFailure)
         }
 
         guard result == kCCSuccess else { fatalError("pbkdf2 error") }