Quellcode durchsuchen

Ply test updates. Fix Authenticator NSData function.

Marcin Krzyżanowski vor 10 Jahren
Ursprung
Commit
597588f922
2 geänderte Dateien mit 11 neuen und 6 gelöschten Zeilen
  1. 1 1
      CryptoSwift/NSDataExtension.swift
  2. 10 5
      CryptoSwiftTests/Poly1305Tests.swift

+ 1 - 1
CryptoSwift/NSDataExtension.swift

@@ -76,7 +76,7 @@ extension NSData {
     
     public func authenticate(authenticator: Authenticator) -> NSData? {
         if let result = authenticator.authenticate(self.bytes()) {
-            NSData.withBytes(result)
+            return NSData.withBytes(result)
         }
         return nil
     }

+ 10 - 5
CryptoSwiftTests/Poly1305Tests.swift

@@ -26,13 +26,18 @@ class Poly1305Tests: XCTestCase {
         let msg:[UInt8] = [0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,0xc0,0xc1]
         let expectedMac:[UInt8] = [0xdd,0xb9,0xda,0x7d,0xdd,0x5e,0x52,0x79,0x27,0x30,0xed,0x5c,0xda,0x5f,0x90,0xa4]
         
-        let mac = Authenticator.Poly1305(key: key).authenticate(msg)
-        XCTAssertEqual(mac!, expectedMac, "Invalid authentication result")
+        if let mac = Authenticator.Poly1305(key: key).authenticate(msg) {
+            XCTAssertEqual(mac, expectedMac, "Invalid authentication result")
+        } else {
+            XCTFail("Missing MAC")
+        }
         
         // extensions
         let msgData = NSData.withBytes(msg)
-        let mac2 = msgData.authenticate(Authenticator.Poly1305(key: key))
-        XCTAssertNotNil(mac2, "")
-        XCTAssertEqual(mac2!, NSData.withBytes(expectedMac), "Invalid authentication result")
+        if let mac2 = msgData.authenticate(Authenticator.Poly1305(key: key)) {
+            XCTAssertEqual(mac2, NSData.withBytes(expectedMac), "Invalid authentication result")
+        } else {
+            XCTFail("Missing MAC")
+        }
     }
 }