Merge pull request #245 from pusher/remove-cryptoswift

Replace CryptoSwift with CommonCrypto HMAC functions

Author: OliverPearmain-Pusher

Cartfile

@@ -1,8 +1,2 @@
-# CryptoSwift versions 0.9 - 0.10 inclusive have iOS deployment
-# target "9.0" set in the Xcode project (but not in the Podspec).
-# PusherSwift has target "8.0" therefore the version in this
-# file can't match PusherSwift's Podspec's minimum CryptoSwift
-# version currently.
-github "krzyzanowskim/CryptoSwift" ~> 0.15.0
 github "ashleymills/Reachability.swift" == 4.3.0
 github "daltoniam/Starscream" == 3.0.6

Cartfile.resolved

@@ -1,3 +1,2 @@
 github "ashleymills/Reachability.swift" "v4.3.0"
 github "daltoniam/Starscream" "3.0.6"
-github "krzyzanowskim/CryptoSwift" "0.15.0"

Package.resolved

@@ -8,15 +8,13 @@ let package = Package(
         .library(name: "PusherSwift", targets: ["PusherSwift"])
     ],
     dependencies: [
-        .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", .upToNextMajor(from: "0.9.0")),
         .package(url: "https://github.com/ashleymills/Reachability.swift.git", .exact("4.3.0")),
         .package(url: "https://github.com/daltoniam/Starscream.git", .exact("3.0.6")),
     ],
     targets: [
         .target(
             name: "PusherSwift",
             dependencies: [
-                "CryptoSwift",
                 "Reachability",
                 "Starscream",
             ],

Package.swift

@@ -12,7 +12,6 @@ Pod::Spec.new do |s|
   s.requires_arc  = true
   s.source_files  = 'Sources/*.swift'
 
-  s.dependency 'CryptoSwift', '~> 0.9'
   s.dependency 'ReachabilitySwift', '4.3.0'
   s.dependency 'Starscream', '~> 3.0.5'
 

PusherSwift.podspec

@@ -36,6 +36,8 @@
 		E24D0AA522D798C8009DE31B /* PusherEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24D0AA422D798C8009DE31B /* PusherEvent.swift */; };
 		E29A4CBC2301BA31000BC499 /* PusherEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29A4CBB2301BA31000BC499 /* PusherEventTests.swift */; };
 		E2CFE43122D79CA7004187C3 /* PusherParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2CFE43022D79CA7004187C3 /* PusherParser.swift */; };
+		E2F40FA523ED782B00985C40 /* PusherCrypto.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F40FA423ED782B00985C40 /* PusherCrypto.swift */; };
+		E2F40FA723ED79BC00985C40 /* PusherCryptoTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2F40FA623ED79BC00985C40 /* PusherCryptoTest.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -82,6 +84,8 @@
 		E24D0AA422D798C8009DE31B /* PusherEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherEvent.swift; sourceTree = "<group>"; };
 		E29A4CBB2301BA31000BC499 /* PusherEventTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherEventTests.swift; sourceTree = "<group>"; };
 		E2CFE43022D79CA7004187C3 /* PusherParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherParser.swift; sourceTree = "<group>"; };
+		E2F40FA423ED782B00985C40 /* PusherCrypto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherCrypto.swift; sourceTree = "<group>"; };
+		E2F40FA623ED79BC00985C40 /* PusherCryptoTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PusherCryptoTest.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,6 +145,7 @@
 				33831CD61A9CFFF200B124F1 /* PusherSwift.h */,
 				E24D0AA422D798C8009DE31B /* PusherEvent.swift */,
 				E2498292231E612700CFBBD6 /* PusherError.swift */,
+				E2F40FA423ED782B00985C40 /* PusherCrypto.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -170,6 +175,7 @@
 				33BB99661D21226C00B25C2A /* PusherTopLevelAPITests.swift */,
 				33BB99671D21226C00B25C2A /* Info.plist */,
 				E29A4CBB2301BA31000BC499 /* PusherEventTests.swift */,
+				E2F40FA623ED79BC00985C40 /* PusherCryptoTest.swift */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -304,7 +310,6 @@
 			);
 			inputPaths = (
 				Starscream,
-				CryptoSwift,
 				Reachability,
 			);
 			name = "Copy Carthage Frameworks";
@@ -326,6 +331,7 @@
 				E2498293231E612700CFBBD6 /* PusherError.swift in Sources */,
 				E24D0AA522D798C8009DE31B /* PusherEvent.swift in Sources */,
 				3389F56A1CAEDD9100563F49 /* PusherWebsocketDelegate.swift in Sources */,
+				E2F40FA523ED782B00985C40 /* PusherCrypto.swift in Sources */,
 				330D7A6D1CAEDA750032FF2C /* PusherChannel.swift in Sources */,
 				3390D1E81F054D1E00E1944D /* Authorizer.swift in Sources */,
 				3389F5721CAEDDF300563F49 /* PusherChannels.swift in Sources */,
@@ -344,6 +350,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				33BB997A1D21230100B25C2A /* PusherConnectionTests.swift in Sources */,
+				E2F40FA723ED79BC00985C40 /* PusherCryptoTest.swift in Sources */,
 				33BB99791D21230100B25C2A /* PusherClientInitializationTests.swift in Sources */,
 				33BB99771D21230100B25C2A /* PresenceChannelTests.swift in Sources */,
 				33BB997C1D21230100B25C2A /* PusherTopLevelAPITests.swift in Sources */,

PusherSwift.xcodeproj/project.pbxproj

@@ -1,7 +1,6 @@
 import Foundation
 import Reachability
 import Starscream
-import CryptoSwift
 
 @objcMembers
 @objc open class PusherConnection: NSObject {
@@ -707,27 +706,22 @@ import CryptoSwift
 
                 return true
             case .inline(secret: let secret):
-                var msg = ""
+                var message = ""
                 var channelData = ""
                 if channel.type == .presence {
                     channelData = getUserDataJSON()
-                    msg = "\(self.socketId!):\(channel.name):\(channelData)"
+                    message = "\(self.socketId!):\(channel.name):\(channelData)"
                 } else {
-                    msg = "\(self.socketId!):\(channel.name)"
+                    message = "\(self.socketId!):\(channel.name)"
                 }
 
-                let secretBuff: [UInt8] = Array(secret.utf8)
-                let msgBuff: [UInt8] = Array(msg.utf8)
+                let signature = PusherCrypto.generateSHA256HMAC(secret: secret, message: message)
+                let auth = "\(self.key):\(signature)".lowercased()
 
-                if let hmac = try? HMAC(key: secretBuff, variant: .sha256).authenticate(msgBuff) {
-                    let signature = Data(bytes: hmac).toHexString()
-                    let auth = "\(self.key):\(signature)".lowercased()
-
-                    if channel.type == .private {
-                        self.handlePrivateChannelAuth(authValue: auth, channel: channel)
-                    } else {
-                        self.handlePresenceChannelAuth(authValue: auth, channel: channel, channelData: channelData)
-                    }
+                if channel.type == .private {
+                    self.handlePrivateChannelAuth(authValue: auth, channel: channel)
+                } else {
+                    self.handlePresenceChannelAuth(authValue: auth, channel: channel, channelData: channelData)
                 }
 
                 return true

Sources/PusherConnection.swift

@@ -0,0 +1,35 @@
+import Foundation
+import CommonCrypto
+
+struct PusherCrypto {
+
+    /**
+        Generates a SHA256 HMAC digest of the message using the secret
+
+        - returns: The hex encoded MAC string
+    */
+     static func generateSHA256HMAC(secret: String, message: String) -> String {
+        let secretData = Data(secret.utf8)
+        let messageData = Data(message.utf8)
+
+        let algorithm = CCHmacAlgorithm(kCCHmacAlgSHA256)
+        let digestLength = Int(CC_SHA256_DIGEST_LENGTH)
+
+        var digest = Data(count: digestLength)
+
+        _ = digest.withUnsafeMutableBytes { digestBytes in
+            _ = secretData.withUnsafeBytes { secretBytes in
+                _ = messageData.withUnsafeBytes { messageBytes in
+                    CCHmac(algorithm, secretBytes, secretData.count, messageBytes, messageData.count, digestBytes)
+                }
+            }
+        }
+
+        // Data to hex string
+        let signature = digest
+            .map { String(format: "%02x", $0) }
+            .joined()
+
+        return signature
+    }
+}

Sources/PusherCrypto.swift

@@ -0,0 +1,15 @@
+@testable
+import PusherSwift
+import XCTest
+
+class PusherCryptoTest: XCTestCase {
+    func testHMACGeneratorGeneratesCorrectMAC() {
+        let secret = "mysecret"
+        let message = "{\"user\":\"my user data\"}"
+
+        let digest = PusherCrypto.generateSHA256HMAC(secret: secret, message: message)
+
+        let expectedDigest = "7705bb9a7934fe4ceee2325e23750f35752899448c2fe5b064d93326c98fd5b3"
+        XCTAssertEqual(digest, expectedDigest)
+    }
+}

Tests/PusherCryptoTest.swift

@@ -192,7 +192,6 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/../Carthage/Build/iOS/CryptoSwift.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/Reachability.framework",
 				"$(SRCROOT)/../Carthage/Build/iOS/Starscream.framework",
 			);