passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests formerly broken by flags.iv

This commit is contained in:
Davide De Rosa 2018-10-19 16:21:13 +02:00
parent cb9735181c
commit 31babe56f0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TunnelKitTests/EncryptionPerformanceTests.swift
View File

@ -80,8 +80,9 @@ class EncryptionPerformanceTests: XCTestCase {
// 0.684s // 0.684s
func testGCMEncryption() { func testGCMEncryption() {
let suite = TestUtils.generateDataSuite(1000, 100000) let suite = TestUtils.generateDataSuite(1000, 100000)
let iv: [UInt8] = [0x11, 0x22, 0x33, 0x44]
let ad: [UInt8] = [0x11, 0x22, 0x33, 0x44] let ad: [UInt8] = [0x11, 0x22, 0x33, 0x44]
var flags = CryptoFlags(packetId: 0, ad: ad, adLength: 4) var flags = CryptoFlags(iv: iv, ivLength: 4, ad: ad, adLength: 4)
measure { measure {
for data in suite { for data in suite {
let _ = try! self.gcmEncrypter.encryptData(data, flags: &flags) let _ = try! self.gcmEncrypter.encryptData(data, flags: &flags)

4
TunnelKitTests/EncryptionTests.swift
View File

@ -79,9 +79,9 @@ class EncryptionTests: XCTestCase {
func testGCM() { func testGCM() {
let (client, server) = clientServer("aes-256-gcm", nil) let (client, server) = clientServer("aes-256-gcm", nil)
// let packetId: UInt32 = 0x56341200 let packetId: [UInt8] = [0x56, 0x34, 0x12, 0x00]
let ad: [UInt8] = [0x00, 0x12, 0x34, 0x56] let ad: [UInt8] = [0x00, 0x12, 0x34, 0x56]
var flags = CryptoFlags(packetId: 0, ad: ad, adLength: 4) var flags = CryptoFlags(iv: packetId, ivLength: 4, ad: ad, adLength: 4)
let plain = Data(hex: "00112233445566778899") let plain = Data(hex: "00112233445566778899")
let encrypted = try! client.encrypter().encryptData(plain, flags: &flags) let encrypted = try! client.encrypter().encryptData(plain, flags: &flags)
let decrypted = try! server.decrypter().decryptData(encrypted, flags: &flags) let decrypted = try! server.decrypter().decryptData(encrypted, flags: &flags)