Browse Source

update tests

Marcin Krzyżanowski 11 years ago
parent
commit
2f5a3bae84
2 changed files with 10 additions and 31 deletions
  1. 4 2
      CryptoSwift/Poly1305.swift
  2. 6 29
      CryptoSwiftTests/CipherTests.swift

+ 4 - 2
CryptoSwift/Poly1305.swift

@@ -235,8 +235,10 @@ public class Poly1305 {
         }
     }
     
-    public func auth(inout mac:[Byte], m:[Byte]) {
+    public func auth(mac:[Byte], m:[Byte]) -> [Byte] {
         update(m)
-        finish(&mac)
+        var macWork = mac
+        finish(&macWork)
+        return macWork
     }
 }

+ 6 - 29
CryptoSwiftTests/CipherTests.swift

@@ -21,37 +21,14 @@ class CipherTests: XCTestCase {
     }
     
     func testPoly1305() {
-        let key:[Byte] = [0xee,0xa6,0xa7,0x25,0x1c,0x1e,0x72,0x91,
-            0x6d,0x11,0xc2,0xcb,0x21,0x4d,0x3c,0x25,
-            0x25,0x39,0x12,0x1d,0x8e,0x23,0x4e,0x65,
-            0x2d,0x65,0x1f,0xa4,0xc8,0xcf,0xf8,0x80]
-        
-        let msg:[Byte] = [0x8e,0x99,0x3b,0x9f,0x48,0x68,0x12,0x73,
-            0xc2,0x96,0x50,0xba,0x32,0xfc,0x76,0xce,
-            0x48,0x33,0x2e,0xa7,0x16,0x4d,0x96,0xa4,
-            0x47,0x6f,0xb8,0xc5,0x31,0xa1,0x18,0x6a,
-            0xc0,0xdf,0xc1,0x7c,0x98,0xdc,0xe8,0x7b,
-            0x4d,0xa7,0xf0,0x11,0xec,0x48,0xc9,0x72,
-            0x71,0xd2,0xc2,0x0f,0x9b,0x92,0x8f,0xe2,
-            0x27,0x0d,0x6f,0xb8,0x63,0xd5,0x17,0x38,
-            0xb4,0x8e,0xee,0xe3,0x14,0xa7,0xcc,0x8a,
-            0xb9,0x32,0x16,0x45,0x48,0xe5,0x26,0xae,
-            0x90,0x22,0x43,0x68,0x51,0x7a,0xcf,0xea,
-            0xbd,0x6b,0xb3,0x73,0x2b,0xc0,0xe9,0xda,
-            0x99,0x83,0x2b,0x61,0xca,0x01,0xb6,0xde,
-            0x56,0x24,0x4a,0x9e,0x88,0xd5,0xf9,0xb3,
-            0x79,0x73,0xf6,0x22,0xa4,0x3d,0x14,0xa6,
-            0x59,0x9b,0x1f,0x65,0x4c,0xb4,0x5a,0x74,
-            0xe3,0x55,0xa5]
-        
-        let verify_mac:[Byte] = [0xf3,0xff,0xc7,0x70,0x3f,0x94,0x00,0xe5,
-                                 0x2a,0x7d,0xfb,0x4b,0x3d,0x33,0x05,0xd9]
-        
+        let key:[Byte] = [0xdd,0xde,0xdf,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc]
+        let msg:[Byte] = [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 mac:[Byte] = [0xe0,0xa8,0x7d,0x58,0xff,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00]
+        let expectedMac:[Byte] = [0xdd,0xb9,0xda,0x7d,0xdd,0x5e,0x52,0x79,0x27,0x30,0xed,0x5c,0xda,0x5f,0x90,0xa4]
         
         let poly = Poly1305(key: key);
-        var mac:[Byte] = [Byte](count: 16, repeatedValue: 0);
-        poly.auth(&mac, m: msg)
-        println(mac)
+        var resultMac = poly.auth(mac, m: msg)
+        println(resultMac)
         println("QQ")
     }