Merge pull request #650 from kabiroberai/kabir/legacy-srp

Fix handling of s2k_fo
XcodesOrg · Nov 5, 2024 · 7b15450 · 7b15450
2 parents 0a02b29 + 8654756
commit 7b15450
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Xcodes/AppleAPI/Sources/AppleAPI/Client.swift b/Xcodes/AppleAPI/Sources/AppleAPI/Client.swift
@@ -54,7 +54,7 @@ public class Client {
                 let iterations = srpInit.iteration
 
                 do {
-                    guard let encryptedPassword = self.pbkdf2(password: password, saltData: decodedSalt, keyByteCount: 32, prf: CCPseudoRandomAlgorithm(kCCPRFHmacAlgSHA256), rounds: iterations) else {
+                    guard let encryptedPassword = self.pbkdf2(password: password, saltData: decodedSalt, keyByteCount: 32, prf: CCPseudoRandomAlgorithm(kCCPRFHmacAlgSHA256), rounds: iterations, protocol: srpInit.protocol) else {
                         return Fail(error: AuthenticationError.srpInvalidPublicKey)
                             .eraseToAnyPublisher()
                     }
@@ -308,9 +308,14 @@ public class Client {
         return Data(hash)
     }
 
-    private func pbkdf2(password: String, saltData: Data, keyByteCount: Int, prf: CCPseudoRandomAlgorithm, rounds: Int) -> Data? {
+    private func pbkdf2(password: String, saltData: Data, keyByteCount: Int, prf: CCPseudoRandomAlgorithm, rounds: Int, protocol srpProtocol: SRPProtocol) -> Data? {
         guard let passwordData = password.data(using: .utf8) else { return nil }
-        let hashedPasswordData = sha256(data: passwordData)
+        let hashedPasswordDataRaw = sha256(data: passwordData)
+        let hashedPasswordData = switch srpProtocol {
+        case .s2k: hashedPasswordDataRaw
+        // the legacy s2k_fo protocol requires hex-encoding the digest before performing PBKDF2.
+        case .s2k_fo: Data(hashedPasswordDataRaw.hexEncodedString().lowercased().utf8)
+        }
 
         var derivedKeyData = Data(repeating: 0, count: keyByteCount)
         let derivedCount = derivedKeyData.count
@@ -584,6 +589,7 @@ public struct ServerSRPInitResponse: Decodable {
     let salt: String
     let b: String
     let c: String
+    let `protocol`: SRPProtocol
 }