Fix onion request encryption

SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI+Encryption.swift

@@ -37,9 +37,8 @@ extension OnionRequestAPI {
         let snodeX25519PublicKey = Data(hex: hexEncodedSnodeX25519PublicKey)
         let ephemeralKeyPair = Curve25519.generateKeyPair()
         let ephemeralSharedSecret = try Curve25519.generateSharedSecret(fromPublicKey: snodeX25519PublicKey, privateKey: ephemeralKeyPair.privateKey)
-        let password = "LOKI"
+        let key = "LOKI"
-        let key = try HKDF(password: password.bytes, variant: .sha256).calculate()
+        let symmetricKey = try HMAC(key: key.bytes, variant: .sha256).authenticate(ephemeralSharedSecret.bytes)
-        let symmetricKey = try HMAC(key: key, variant: .sha256).authenticate(ephemeralSharedSecret.bytes)
         let ciphertext = try encrypt(plaintext, usingAESGCMWithSymmetricKey: Data(bytes: symmetricKey))
         return (ciphertext, Data(bytes: symmetricKey), ephemeralKeyPair.publicKey)
     }

SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPI.swift

@@ -97,20 +97,23 @@ internal enum OnionRequestAPI {
                     var json: JSON? = nil
                     if let j = try? JSONSerialization.jsonObject(with: data, options: []) as? JSON {
                         json = j
-                    } else if let message = String(data: data, encoding: .utf8) {
+                    } else if let result = String(data: data, encoding: .utf8) {
-                        json = [ "message" : message ]
+                        json = [ "result" : result ]
                     }
                     let jsonDescription = json?.prettifiedDescription ?? "no debugging info provided"
                     print("[Loki] [Onion Request API] \(verb.rawValue) request to \(url) failed with status code: \(statusCode) (\(jsonDescription)).")
                     return seal.reject(Error.httpRequestFailed(statusCode: statusCode, json: json))
                 }
-                do {
+                var json: JSON! = nil
-                    let json = try JSONSerialization.jsonObject(with: data, options: [])
+                if let j = try? JSONSerialization.jsonObject(with: data, options: []) as? JSON {
-                    seal.fulfill(json)
+                    json = j
-                } catch (let error) {
+                } else if let result = String(data: data, encoding: .utf8) {
+                    json = [ "result" : result ]
+                } else {
                     print("[Loki] [Onion Request API] Couldn't parse JSON returned by \(verb.rawValue) request to \(url).")
-                    seal.reject(error)
+                    return seal.reject(Error.invalidJSON)
                 }
+                seal.fulfill(json)
             }
             task.resume()
         }