浏览代码

Resolve compilation warnings in tests

Marcin Krzyżanowski 9 年之前
父节点
当前提交
108fb395fa
共有 2 个文件被更改,包括 6 次插入7 次删除
  1. 3 4
      CryptoSwiftTests/ChaCha20Tests.swift
  2. 3 3
      CryptoSwiftTests/PaddingTests.swift

+ 3 - 4
CryptoSwiftTests/ChaCha20Tests.swift

@@ -47,15 +47,14 @@ final class ChaCha20Tests: XCTestCase {
             let expectedHex = expectedHexes[idx]
             let message = [UInt8](count: (expectedHex.characters.count / 2), repeatedValue: 0)
             
-            let setup = (key: keys[idx], iv: ivs[idx])
             do {
-                let encrypted = try ChaCha20(setup)!.encrypt(message)
-                let decrypted = try ChaCha20(setup)!.decrypt(encrypted)
+                let encrypted = try ChaCha20(key: keys[idx], iv: ivs[idx])!.encrypt(message)
+                let decrypted = try ChaCha20(key: keys[idx], iv: ivs[idx])!.decrypt(encrypted)
                 XCTAssertEqual(message, decrypted, "ChaCha20 decryption failed");
                 
                 // check extension
                 let messageData = NSData(bytes: message, length: message.count);
-                let encrypted2 = try! messageData.encrypt(ChaCha20(setup)!)
+                let encrypted2 = try! messageData.encrypt(ChaCha20(key: keys[idx], iv: ivs[idx])!)
                 XCTAssertNotNil(encrypted2, "")
                 XCTAssertEqual(NSData.withBytes(encrypted), encrypted2, "ChaCha20 extension failed")
             } catch CipherError.Encrypt {

+ 3 - 3
CryptoSwiftTests/PaddingTests.swift

@@ -14,7 +14,7 @@ final class PaddingTests: XCTestCase {
         let expected:[UInt8] = [1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,6,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16]
         let padded = PKCS7().add(input, blockSize: 16)
         XCTAssertEqual(padded, expected, "PKCS7 failed")
-        let clean = try! PKCS7().remove(padded, blockSize: nil)
+        let clean = PKCS7().remove(padded, blockSize: nil)
         XCTAssertEqual(clean, input, "PKCS7 failed")
     }
     
@@ -23,7 +23,7 @@ final class PaddingTests: XCTestCase {
         let expected:[UInt8] = [1,2,3,4,5,6,7,8,9,0,1,2,3,4,5,1]
         let padded = PKCS7().add(input, blockSize: 16)
         XCTAssertEqual(padded, expected, "PKCS7 failed")
-        let clean = try! PKCS7().remove(padded, blockSize: nil)
+        let clean = PKCS7().remove(padded, blockSize: nil)
         XCTAssertEqual(clean, input, "PKCS7 failed")
     }
     
@@ -32,7 +32,7 @@ final class PaddingTests: XCTestCase {
         let expected:[UInt8] = [1,2,3,4,5,6,7,8,9,0,1,2,3,4,2,2]
         let padded = PKCS7().add(input, blockSize: 16)
         XCTAssertEqual(padded, expected, "PKCS7 failed")
-        let clean = try! PKCS7().remove(padded, blockSize: nil)
+        let clean = PKCS7().remove(padded, blockSize: nil)
         XCTAssertEqual(clean, input, "PKCS7 failed")
     }
 }