소스 검색

remove trailing commas in codebase

Nicholas Maccharoli 5 년 전
부모
커밋
e9c9c22544

+ 2 - 2
Package.swift

@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "CryptoSwift",
     platforms: [
-        .macOS(.v10_10), .iOS(.v8), .tvOS(.v9),
+        .macOS(.v10_10), .iOS(.v8), .tvOS(.v9)
     ],
     products: [
         .library(
@@ -15,7 +15,7 @@ let package = Package(
     targets: [
         .target(name: "CryptoSwift"),
         .testTarget(name: "CryptoSwiftTests", dependencies: ["CryptoSwift"]),
-        .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"]),
+        .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"])
     ],
     swiftLanguageVersions: [.v5]
 )

+ 1 - 1
Package@swift-4.2.swift

@@ -12,7 +12,7 @@ let package = Package(
     targets: [
         .target(name: "CryptoSwift"),
         .testTarget(name: "Tests", dependencies: ["CryptoSwift"]),
-        .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"]),
+        .testTarget(name: "TestsPerformance", dependencies: ["CryptoSwift"])
     ],
     swiftLanguageVersions: [.v4, .v4_2]
 )

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1 - 1
Sources/CryptoSwift/AES.swift


+ 14 - 14
Sources/CryptoSwift/Blowfish.swift

@@ -44,7 +44,7 @@ public final class Blowfish {
         0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822,
         0x299f31d0, 0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377,
         0xbe5466cf, 0x34e90c6c, 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5,
-        0xb5470917, 0x9216d5d9, 0x8979fb1b,
+        0xb5470917, 0x9216d5d9, 0x8979fb1b
     ]
 
     private let origS: Array<Array<UInt32>> = [
@@ -112,7 +112,7 @@ public final class Blowfish {
             0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
             0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
             0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-            0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
+            0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
         ],
         [
             0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
@@ -178,7 +178,7 @@ public final class Blowfish {
             0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
             0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
             0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-            0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
+            0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
         ],
         [
             0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
@@ -244,7 +244,7 @@ public final class Blowfish {
             0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
             0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
             0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-            0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
+            0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
         ],
         [
             0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
@@ -310,8 +310,8 @@ public final class Blowfish {
             0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
             0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
             0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-            0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6,
-        ],
+            0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+        ]
     ]
 
     public init(key: Array<UInt8>, blockMode: BlockMode = CBC(iv: Array<UInt8>(repeating: 0, count: Blowfish.blockSize)), padding: Padding) throws {
@@ -387,19 +387,19 @@ public final class Blowfish {
         // because everything is too complex to be solved in reasonable time o_O
         result += [
             UInt8((l >> 24) & 0xff),
-            UInt8((l >> 16) & 0xff),
+            UInt8((l >> 16) & 0xff)
         ]
         result += [
             UInt8((l >> 8) & 0xff),
-            UInt8((l >> 0) & 0xff),
+            UInt8((l >> 0) & 0xff)
         ]
         result += [
             UInt8((r >> 24) & 0xff),
-            UInt8((r >> 16) & 0xff),
+            UInt8((r >> 16) & 0xff)
         ]
         result += [
             UInt8((r >> 8) & 0xff),
-            UInt8((r >> 0) & 0xff),
+            UInt8((r >> 0) & 0xff)
         ]
 
         return result
@@ -416,19 +416,19 @@ public final class Blowfish {
         // because everything is too complex to be solved in reasonable time o_O
         result += [
             UInt8((l >> 24) & 0xff),
-            UInt8((l >> 16) & 0xff),
+            UInt8((l >> 16) & 0xff)
         ]
         result += [
             UInt8((l >> 8) & 0xff),
-            UInt8((l >> 0) & 0xff),
+            UInt8((l >> 0) & 0xff)
         ]
         result += [
             UInt8((r >> 24) & 0xff),
-            UInt8((r >> 16) & 0xff),
+            UInt8((r >> 16) & 0xff)
         ]
         result += [
             UInt8((r >> 8) & 0xff),
-            UInt8((r >> 0) & 0xff),
+            UInt8((r >> 0) & 0xff)
         ]
         return result
     }

+ 3 - 3
Sources/CryptoSwift/Checksum.swift

@@ -47,7 +47,7 @@ public final class Checksum {
         0xA00A_E278, 0xD70D_D2EE, 0x4E04_8354, 0x3903_B3C2, 0xA767_2661, 0xD060_16F7, 0x4969_474D, 0x3E6E_77DB,
         0xAED1_6A4A, 0xD9D6_5ADC, 0x40DF_0B66, 0x37D8_3BF0, 0xA9BC_AE53, 0xDEBB_9EC5, 0x47B2_CF7F, 0x30B5_FFE9,
         0xBDBD_F21C, 0xCABA_C28A, 0x53B3_9330, 0x24B4_A3A6, 0xBAD0_3605, 0xCDD7_0693, 0x54DE_5729, 0x23D9_67BF,
-        0xB366_7A2E, 0xC461_4AB8, 0x5D68_1B02, 0x2A6F_2B94, 0xB40B_BE37, 0xC30C_8EA1, 0x5A05_DF1B, 0x2D02_EF8D,
+        0xB366_7A2E, 0xC461_4AB8, 0x5D68_1B02, 0x2A6F_2B94, 0xB40B_BE37, 0xC30C_8EA1, 0x5A05_DF1B, 0x2D02_EF8D
     ]
 
     private static let table32c: Array<UInt32> = [
@@ -82,7 +82,7 @@ public final class Checksum {
         0xE330_A81A, 0x115B_2B19, 0x020B_D8ED, 0xF060_5BEE, 0x24AA_3F05, 0xD6C1_BC06, 0xC591_4FF2, 0x37FA_CCF1,
         0x69E9_F0D5, 0x9B82_73D6, 0x88D2_8022, 0x7AB9_0321, 0xAE73_67CA, 0x5C18_E4C9, 0x4F48_173D, 0xBD23_943E,
         0xF36E_6F75, 0x0105_EC76, 0x1255_1F82, 0xE03E_9C81, 0x34F4_F86A, 0xC69F_7B69, 0xD5CF_889D, 0x27A4_0B9E,
-        0x79B7_37BA, 0x8BDC_B4B9, 0x988C_474D, 0x6AE7_C44E, 0xBE2D_A0A5, 0x4C46_23A6, 0x5F16_D052, 0xAD7D_5351,
+        0x79B7_37BA, 0x8BDC_B4B9, 0x988C_474D, 0x6AE7_C44E, 0xBE2D_A0A5, 0x4C46_23A6, 0x5F16_D052, 0xAD7D_5351
     ]
 
     private static let table16: Array<UInt16> = [
@@ -117,7 +117,7 @@ public final class Checksum {
         0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
         0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
         0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
-        0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040,
+        0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040
     ]
 
     /// Polynomial: 0xEDB88320 (Reversed) - IEEE

+ 2 - 2
Sources/CryptoSwift/MD5.swift

@@ -27,7 +27,7 @@ public final class MD5: DigestType {
         7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
         5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
         4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
-        6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21,
+        6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21
     ]
 
     /** binary integer part of the sines of integers (Radians) */
@@ -47,7 +47,7 @@ public final class MD5: DigestType {
         0xf4292244, 0x432aff97, 0xab9423a7, 0xfc93a039,
         0x655b59c3, 0x8f0ccc92, 0xffeff47d, 0x85845dd1,
         0x6fa87e4f, 0xfe2ce6e0, 0xa3014314, 0x4e0811a1,
-        0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
+        0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391
     ]
 
     public init() {

+ 1 - 1
Sources/CryptoSwift/Rabbit.swift

@@ -55,7 +55,7 @@ public final class Rabbit: BlockCipher {
         0xd34d34d3,
         0x34d34d34,
         0x4d34d34d,
-        0xd34d34d3,
+        0xd34d34d3
     ]
 
     // MARK: - Initializers

+ 2 - 2
Sources/CryptoSwift/SHA2.swift

@@ -118,7 +118,7 @@ public final class SHA2: DigestType {
                 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
                 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
                 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-                0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
+                0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
             ]
         case .sha384, .sha512:
             accumulatedHash64 = variant.h
@@ -141,7 +141,7 @@ public final class SHA2: DigestType {
                 0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915, 0xc67178f2e372532b, 0xca273eceea26619c,
                 0xd186b8c721c0c207, 0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, 0x06f067aa72176fba, 0x0a637dc5a2c898a6,
                 0x113f9804bef90dae, 0x1b710b35131c471b, 0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc,
-                0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817,
+                0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a, 0x5fcb6fab3ad6faec, 0x6c44198c4a475817
             ]
         }
     }

+ 1 - 1
Sources/CryptoSwift/SHA3.swift

@@ -30,7 +30,7 @@ public final class SHA3: DigestType {
         0x000000000000008a, 0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
         0x000000008000808b, 0x800000000000008b, 0x8000000000008089, 0x8000000000008003,
         0x8000000000008002, 0x8000000000000080, 0x000000000000800a, 0x800000008000000a,
-        0x8000000080008081, 0x8000000000008080, 0x0000000080000001, 0x8000000080008008,
+        0x8000000080008081, 0x8000000000008080, 0x0000000080000001, 0x8000000080008008
     ]
 
     public let blockSize: Int

+ 1 - 1
Tests/CryptoSwiftTests/AESTestsPerf.swift

@@ -43,7 +43,7 @@ extension AESTestsPerf {
     static func allTests() -> [(String, (AESTestsPerf) -> () -> Void)] {
         let tests = [
             ("testAESEncryptPerformance", testAESEncryptPerformance),
-            ("testAESDecryptPerformance", testAESDecryptPerformance),
+            ("testAESDecryptPerformance", testAESDecryptPerformance)
         ]
         return tests
     }

+ 1 - 1
Tests/CryptoSwiftTests/Access.swift

@@ -289,6 +289,6 @@ class Access: XCTestCase {
         ("testRabbit", testRabbit),
         ("testChaCha20", testChaCha20),
         ("testUpdatable", testUpdatable),
-        ("testRandomIV", testRandomIV),
+        ("testRandomIV", testRandomIV)
     ]
 }

+ 2 - 2
Tests/CryptoSwiftTests/BlowfishTests.swift

@@ -157,7 +157,7 @@ class BlowfishTests: XCTestCase {
 
         TestData(key: [0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10],
                  input: [0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff],
-                 output: [0x6b, 0x5c, 0x5a, 0x9c, 0x5d, 0x9e, 0x0a, 0x5a]),
+                 output: [0x6b, 0x5c, 0x5a, 0x9c, 0x5d, 0x9e, 0x0a, 0x5a])
     ]
 
     func testEncrypt() {
@@ -216,7 +216,7 @@ extension BlowfishTests {
             ("testDecrypt", testDecrypt),
             ("testCBCZeroPadding", testCBCZeroPadding),
             ("testEncryptDecrypt", testEncryptDecrypt),
-            ("testDecryptCFB415", testDecryptCFB415),
+            ("testDecryptCFB415", testDecryptCFB415)
         ]
         return tests
     }

+ 1 - 1
Tests/CryptoSwiftTests/CBCMacTests.swift

@@ -56,6 +56,6 @@ class CBCMacTests: XCTestCase {
         ("testMessageLength0", testMessageLength0),
         ("testMessageLength16", testMessageLength16),
         ("testMessageLength40", testMessageLength40),
-        ("testMessageLength64", testMessageLength64),
+        ("testMessageLength64", testMessageLength64)
     ]
 }

+ 1 - 1
Tests/CryptoSwiftTests/CMACTests.swift

@@ -59,6 +59,6 @@ final class CMACTests: XCTestCase {
         ("testMessageLength0", testMessageLength0),
         ("testMessageLength16", testMessageLength16),
         ("testMessageLength40", testMessageLength40),
-        ("testMessageLength64", testMessageLength64),
+        ("testMessageLength64", testMessageLength64)
     ]
 }

+ 1 - 1
Tests/CryptoSwiftTests/ChaCha20Poly1305Tests.swift

@@ -23,7 +23,7 @@ class ChaCha20Poly1305Tests: XCTestCase {
     static let allTests = [
         ("testCCPoly1", test1),
         ("testCCPoly2", test2),
-        ("testCCPoly3", test3),
+        ("testCCPoly3", test3)
     ]
 
     func test1() {

+ 4 - 4
Tests/CryptoSwiftTests/ChaCha20Tests.swift

@@ -24,7 +24,7 @@ final class ChaCha20Tests: XCTestCase {
             [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01],
             [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
             [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
-            [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f],
+            [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f]
         ]
 
         let ivs: [Array<UInt8>] = [
@@ -32,7 +32,7 @@ final class ChaCha20Tests: XCTestCase {
             [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
             [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01],
             [0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00],
-            [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07],
+            [0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07]
         ]
 
         let expectedHexes = [
@@ -40,7 +40,7 @@ final class ChaCha20Tests: XCTestCase {
             "4540F05A9F1FB296D7736E7B208E3C96EB4FE1834688D2604F450952ED432D41BBE2A0B6EA7566D2A5D1E7E20D42AF2C53D792B1C43FEA817E9AD275AE546963",
             "DE9CBA7BF3D69EF5E786DC63973F653A0B49E015ADBFF7134FCB7DF137821031E85A050278A7084527214F73EFC7FA5B5277062EB7A0433E445F41E3",
             "EF3FDFD6C61578FBF5CF35BD3DD33B8009631634D21E42AC33960BD138E50D32111E4CAF237EE53CA8AD6426194A88545DDC497A0B466E7D6BBDB0041B2F586B",
-            "F798A189F195E66982105FFB640BB7757F579DA31602FC93EC01AC56F85AC3C134A4547B733B46413042C9440049176905D3BE59EA1C53F15916155C2BE8241A38008B9A26BC35941E2444177C8ADE6689DE95264986D95889FB60E84629C9BD9A5ACB1CC118BE563EB9B3A4A472F82E09A7E778492B562EF7130E88DFE031C79DB9D4F7C7A899151B9A475032B63FC385245FE054E3DD5A97A5F576FE064025D3CE042C566AB2C507B138DB853E3D6959660996546CC9C4A6EAFDC777C040D70EAF46F76DAD3979E5C5360C3317166A1C894C94A371876A94DF7628FE4EAAF2CCB27D5AAAE0AD7AD0F9D4B6AD3B54098746D4524D38407A6DEB3AB78FAB78C9",
+            "F798A189F195E66982105FFB640BB7757F579DA31602FC93EC01AC56F85AC3C134A4547B733B46413042C9440049176905D3BE59EA1C53F15916155C2BE8241A38008B9A26BC35941E2444177C8ADE6689DE95264986D95889FB60E84629C9BD9A5ACB1CC118BE563EB9B3A4A472F82E09A7E778492B562EF7130E88DFE031C79DB9D4F7C7A899151B9A475032B63FC385245FE054E3DD5A97A5F576FE064025D3CE042C566AB2C507B138DB853E3D6959660996546CC9C4A6EAFDC777C040D70EAF46F76DAD3979E5C5360C3317166A1C894C94A371876A94DF7628FE4EAAF2CCB27D5AAAE0AD7AD0F9D4B6AD3B54098746D4524D38407A6DEB3AB78FAB78C9"
         ]
 
         for idx in 0..<keys.count {
@@ -114,7 +114,7 @@ extension ChaCha20Tests {
             ("testChaCha20", testChaCha20),
             ("testCore", testCore),
             ("testVector1Py", testVector1Py),
-            ("testChaCha20EncryptPartial", testChaCha20EncryptPartial),
+            ("testChaCha20EncryptPartial", testChaCha20EncryptPartial)
         ]
 
         return tests

+ 1 - 1
Tests/CryptoSwiftTests/DigestTests.swift

@@ -277,7 +277,7 @@ extension DigestTests {
             ("testCRC32NotReflected", testCRC32NotReflected),
             ("testCRC16", testCRC16),
             ("testChecksum", testChecksum),
-            ("testSHAPartialUpdates", testSHAPartialUpdates),
+            ("testSHAPartialUpdates", testSHAPartialUpdates)
         ]
 
         return tests

+ 1 - 1
Tests/CryptoSwiftTests/ExtensionsTest.swift

@@ -93,7 +93,7 @@ extension ExtensionsTest {
             ("testStringEncrypt", testStringEncrypt),
             ("testStringDecryptBase64", testStringDecryptBase64),
             ("testEmptyStringEncrypt", testEmptyStringEncrypt),
-            ("testArrayInitHex", testArrayInitHex),
+            ("testArrayInitHex", testArrayInitHex)
         ]
 
         return tests

+ 1 - 1
Tests/CryptoSwiftTests/ExtensionsTestPerf.swift

@@ -32,7 +32,7 @@ final class ExtensionsTestPerf: XCTestCase {
 extension ExtensionsTestPerf {
     static func allTests() -> [(String, (ExtensionsTestPerf) -> () -> Void)] {
         let tests = [
-            ("testArrayInitHexPerformance", testArrayInitHexPerformance),
+            ("testArrayInitHexPerformance", testArrayInitHexPerformance)
         ]
         return tests
     }

+ 1 - 1
Tests/CryptoSwiftTests/HKDFTests.swift

@@ -89,7 +89,7 @@ class HKDFTests: XCTestCase {
             ("Test with SHA-256 and zero-length salt/info", testHKDF3),
             ("Basic test case with SHA-1", testHKDF4),
             ("Test with SHA-1 and longer inputs/outputs", testHKDF5),
-            ("Test with SHA-1 and zero-length salt/info", testHKDF6),
+            ("Test with SHA-1 and zero-length salt/info", testHKDF6)
         ]
 
         return tests

+ 1 - 1
Tests/CryptoSwiftTests/HMACTests.swift

@@ -66,6 +66,6 @@ final class HMACTests: XCTestCase {
         ("testSHA1", testSHA1),
         ("testSHA256", testSHA256),
         ("testSHA384", testSHA384),
-        ("testSHA512", testSHA512),
+        ("testSHA512", testSHA512)
     ]
 }

+ 1 - 1
Tests/CryptoSwiftTests/PBKDF.swift

@@ -66,7 +66,7 @@ class PBKDF: XCTestCase {
         let tests = [
             ("testPBKDF1", testPBKDF1),
             ("testPBKDF2", testPBKDF2),
-            ("testPBKDF2Length", testPBKDF2Length),
+            ("testPBKDF2Length", testPBKDF2Length)
         ]
 
         return tests

+ 1 - 1
Tests/CryptoSwiftTests/PaddingTests.swift

@@ -65,6 +65,6 @@ final class PaddingTests: XCTestCase {
         ("testPKCS7_1", testPKCS7_1),
         ("testPKCS7_2", testPKCS7_2),
         ("testZeroPadding1", testZeroPadding1),
-        ("testZeroPadding2", testZeroPadding2),
+        ("testZeroPadding2", testZeroPadding2)
     ]
 }

+ 1 - 1
Tests/CryptoSwiftTests/Poly1305Tests.swift

@@ -40,6 +40,6 @@ final class Poly1305Tests: XCTestCase {
 
     static let allTests = [
         ("testPoly1305", testPoly1305),
-        ("testIssue183", testIssue183),
+        ("testIssue183", testIssue183)
     ]
 }

+ 9 - 9
Tests/CryptoSwiftTests/RabbitTests.swift

@@ -43,7 +43,7 @@ class RabbitTests: XCTestCase {
                 [
                     0xb1, 0x57, 0x54, 0xf0, 0x36, 0xa5, 0xd6, 0xec, 0xf5, 0x6b, 0x45, 0x26, 0x1c, 0x4a, 0xf7, 0x02,
                     0x88, 0xe8, 0xd8, 0x15, 0xc5, 0x9c, 0x0c, 0x39, 0x7b, 0x69, 0x6c, 0x47, 0x89, 0xc6, 0x8a, 0xa7,
-                    0xf4, 0x16, 0xa1, 0xc3, 0x70, 0x0c, 0xd4, 0x51, 0xda, 0x68, 0xd1, 0x88, 0x16, 0x73, 0xd6, 0x96,
+                    0xf4, 0x16, 0xa1, 0xc3, 0x70, 0x0c, 0xd4, 0x51, 0xda, 0x68, 0xd1, 0x88, 0x16, 0x73, 0xd6, 0x96
                 ]
             ),
             // Second case
@@ -52,7 +52,7 @@ class RabbitTests: XCTestCase {
                 [
                     0x3d, 0x2d, 0xf3, 0xc8, 0x3e, 0xf6, 0x27, 0xa1, 0xe9, 0x7f, 0xc3, 0x84, 0x87, 0xe2, 0x51, 0x9c,
                     0xf5, 0x76, 0xcd, 0x61, 0xf4, 0x40, 0x5b, 0x88, 0x96, 0xbf, 0x53, 0xaa, 0x85, 0x54, 0xfc, 0x19,
-                    0xe5, 0x54, 0x74, 0x73, 0xfb, 0xdb, 0x43, 0x50, 0x8a, 0xe5, 0x3b, 0x20, 0x20, 0x4d, 0x4c, 0x5e,
+                    0xe5, 0x54, 0x74, 0x73, 0xfb, 0xdb, 0x43, 0x50, 0x8a, 0xe5, 0x3b, 0x20, 0x20, 0x4d, 0x4c, 0x5e
                 ]
             ),
             // Third case
@@ -61,9 +61,9 @@ class RabbitTests: XCTestCase {
                 [
                     0x0c, 0xb1, 0x0d, 0xcd, 0xa0, 0x41, 0xcd, 0xac, 0x32, 0xeb, 0x5c, 0xfd, 0x02, 0xd0, 0x60, 0x9b,
                     0x95, 0xfc, 0x9f, 0xca, 0x0f, 0x17, 0x01, 0x5a, 0x7b, 0x70, 0x92, 0x11, 0x4c, 0xff, 0x3e, 0xad,
-                    0x96, 0x49, 0xe5, 0xde, 0x8b, 0xfc, 0x7f, 0x3f, 0x92, 0x41, 0x47, 0xad, 0x3a, 0x94, 0x74, 0x28,
+                    0x96, 0x49, 0xe5, 0xde, 0x8b, 0xfc, 0x7f, 0x3f, 0x92, 0x41, 0x47, 0xad, 0x3a, 0x94, 0x74, 0x28
                 ]
-            ),
+            )
         ]
 
         let plainText = Array<UInt8>(repeating: 0, count: 48)
@@ -84,7 +84,7 @@ class RabbitTests: XCTestCase {
                 [
                     0xc6, 0xa7, 0x27, 0x5e, 0xf8, 0x54, 0x95, 0xd8, 0x7c, 0xcd, 0x5d, 0x37, 0x67, 0x05, 0xb7, 0xed,
                     0x5f, 0x29, 0xa6, 0xac, 0x04, 0xf5, 0xef, 0xd4, 0x7b, 0x8f, 0x29, 0x32, 0x70, 0xdc, 0x4a, 0x8d,
-                    0x2a, 0xde, 0x82, 0x2b, 0x29, 0xde, 0x6c, 0x1e, 0xe5, 0x2b, 0xdb, 0x8a, 0x47, 0xbf, 0x8f, 0x66,
+                    0x2a, 0xde, 0x82, 0x2b, 0x29, 0xde, 0x6c, 0x1e, 0xe5, 0x2b, 0xdb, 0x8a, 0x47, 0xbf, 0x8f, 0x66
                 ]
             ),
             (
@@ -92,7 +92,7 @@ class RabbitTests: XCTestCase {
                 [
                     0x1f, 0xcd, 0x4e, 0xb9, 0x58, 0x00, 0x12, 0xe2, 0xe0, 0xdc, 0xcc, 0x92, 0x22, 0x01, 0x7d, 0x6d,
                     0xa7, 0x5f, 0x4e, 0x10, 0xd1, 0x21, 0x25, 0x01, 0x7b, 0x24, 0x99, 0xff, 0xed, 0x93, 0x6f, 0x2e,
-                    0xeb, 0xc1, 0x12, 0xc3, 0x93, 0xe7, 0x38, 0x39, 0x23, 0x56, 0xbd, 0xd0, 0x12, 0x02, 0x9b, 0xa7,
+                    0xeb, 0xc1, 0x12, 0xc3, 0x93, 0xe7, 0x38, 0x39, 0x23, 0x56, 0xbd, 0xd0, 0x12, 0x02, 0x9b, 0xa7
                 ]
             ),
             (
@@ -100,9 +100,9 @@ class RabbitTests: XCTestCase {
                 [
                     0x44, 0x5a, 0xd8, 0xc8, 0x05, 0x85, 0x8d, 0xbf, 0x70, 0xb6, 0xaf, 0x23, 0xa1, 0x51, 0x10, 0x4d,
                     0x96, 0xc8, 0xf2, 0x79, 0x47, 0xf4, 0x2c, 0x5b, 0xae, 0xae, 0x67, 0xc6, 0xac, 0xc3, 0x5b, 0x03,
-                    0x9f, 0xcb, 0xfc, 0x89, 0x5f, 0xa7, 0x1c, 0x17, 0x31, 0x3d, 0xf0, 0x34, 0xf0, 0x15, 0x51, 0xcb,
+                    0x9f, 0xcb, 0xfc, 0x89, 0x5f, 0xa7, 0x1c, 0x17, 0x31, 0x3d, 0xf0, 0x34, 0xf0, 0x15, 0x51, 0xcb
                 ]
-            ),
+            )
         ]
 
         let plainText = Array<UInt8>(repeating: 0, count: 48)
@@ -120,7 +120,7 @@ extension RabbitTests {
         let tests = [
             ("testInitialization", testInitialization),
             ("testRabbitWithoutIV", testRabbitWithoutIV),
-            ("testRabbitWithIV", testRabbitWithIV),
+            ("testRabbitWithIV", testRabbitWithIV)
         ]
 
         return tests

+ 1 - 1
Tests/CryptoSwiftTests/RabbitTestsPerf.swift

@@ -30,7 +30,7 @@ class RabbitTestsPerf: XCTestCase {
 extension RabbitTestsPerf {
     static func allTests() -> [(String, (RabbitTestsPerf) -> () -> Void)] {
         let tests = [
-            ("testRabbitPerformance", testRabbitPerformance),
+            ("testRabbitPerformance", testRabbitPerformance)
         ]
         return tests
     }

+ 1 - 1
Tests/CryptoSwiftTests/ScryptTestsPerf.swift

@@ -32,7 +32,7 @@ class ScryptTestsPeft: XCTestCase {
 extension ScryptTestsPeft {
     static func allTests() -> [(String, (ScryptTestsPeft) -> () -> Void)] {
         let tests = [
-            ("testScryptPerformance", testScryptPerformance),
+            ("testScryptPerformance", testScryptPerformance)
             ]
         return tests
     }

+ 25 - 25
Tests/CryptoSwiftTests/XCTestManifests.swift

@@ -13,7 +13,7 @@ extension AESCCMTests {
         ("testAESCCMTestCase3", testAESCCMTestCase3),
         ("testAESCCMTestCase3Decrypt", testAESCCMTestCase3Decrypt),
         ("testAESCCMTestCase3DecryptPartial", testAESCCMTestCase3DecryptPartial),
-        ("testAESCCMTestDVPT256", testAESCCMTestDVPT256),
+        ("testAESCCMTestDVPT256", testAESCCMTestDVPT256)
     ]
 }
 
@@ -57,7 +57,7 @@ extension AESTests {
         ("testAESWithWrongKey", testAESWithWrongKey),
         ("testIssue298", testIssue298),
         ("testIssue394", testIssue394),
-        ("testIssue411", testIssue411),
+        ("testIssue411", testIssue411)
     ]
 }
 
@@ -67,7 +67,7 @@ extension AESTestsPerf {
     // to regenerate.
     static let __allTests__AESTestsPerf = [
         ("testAESDecryptPerformance", testAESDecryptPerformance),
-        ("testAESEncryptPerformance", testAESEncryptPerformance),
+        ("testAESEncryptPerformance", testAESEncryptPerformance)
     ]
 }
 
@@ -96,7 +96,7 @@ extension Access {
         ("testUInt32Extension", testUInt32Extension),
         ("testUInt64Extension", testUInt64Extension),
         ("testUInt8Extension", testUInt8Extension),
-        ("testUpdatable", testUpdatable),
+        ("testUpdatable", testUpdatable)
     ]
 }
 
@@ -109,7 +109,7 @@ extension BlowfishTests {
         ("testDecrypt", testDecrypt),
         ("testDecryptCFB415", testDecryptCFB415),
         ("testEncrypt", testEncrypt),
-        ("testEncryptDecrypt", testEncryptDecrypt),
+        ("testEncryptDecrypt", testEncryptDecrypt)
     ]
 }
 
@@ -121,7 +121,7 @@ extension CBCMacTests {
         ("testMessageLength0", testMessageLength0),
         ("testMessageLength16", testMessageLength16),
         ("testMessageLength40", testMessageLength40),
-        ("testMessageLength64", testMessageLength64),
+        ("testMessageLength64", testMessageLength64)
     ]
 }
 
@@ -133,7 +133,7 @@ extension CMACTests {
         ("testMessageLength0", testMessageLength0),
         ("testMessageLength16", testMessageLength16),
         ("testMessageLength40", testMessageLength40),
-        ("testMessageLength64", testMessageLength64),
+        ("testMessageLength64", testMessageLength64)
     ]
 }
 
@@ -144,7 +144,7 @@ extension ChaCha20Poly1305Tests {
     static let __allTests__ChaCha20Poly1305Tests = [
         ("test1", test1),
         ("test2", test2),
-        ("test3", test3),
+        ("test3", test3)
     ]
 }
 
@@ -156,7 +156,7 @@ extension ChaCha20Tests {
         ("testChaCha20", testChaCha20),
         ("testChaCha20EncryptPartial", testChaCha20EncryptPartial),
         ("testCore", testCore),
-        ("testVector1Py", testVector1Py),
+        ("testVector1Py", testVector1Py)
     ]
 }
 
@@ -165,7 +165,7 @@ extension ChaCha20TestsPerf {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__ChaCha20TestsPerf = [
-        ("testChaCha20Performance", testChaCha20Performance),
+        ("testChaCha20Performance", testChaCha20Performance)
     ]
 }
 
@@ -187,7 +187,7 @@ extension DigestTests {
         ("testSHA1Updatable2", testSHA1Updatable2),
         ("testSHA2", testSHA2),
         ("testSHA3", testSHA3),
-        ("testSHAPartialUpdates", testSHAPartialUpdates),
+        ("testSHAPartialUpdates", testSHAPartialUpdates)
     ]
 }
 
@@ -197,7 +197,7 @@ extension DigestTestsPerf {
     // to regenerate.
     static let __allTests__DigestTestsPerf = [
         ("testMD5Performance", testMD5Performance),
-        ("testSHA1Performance", testSHA1Performance),
+        ("testSHA1Performance", testSHA1Performance)
     ]
 }
 
@@ -212,7 +212,7 @@ extension ExtensionsTest {
         ("testEmptyStringEncrypt", testEmptyStringEncrypt),
         ("testStringDecryptBase64", testStringDecryptBase64),
         ("testStringEncrypt", testStringEncrypt),
-        ("testToUInt32Array", testToUInt32Array),
+        ("testToUInt32Array", testToUInt32Array)
     ]
 }
 
@@ -221,7 +221,7 @@ extension ExtensionsTestPerf {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__ExtensionsTestPerf = [
-        ("testArrayInitHexPerformance", testArrayInitHexPerformance),
+        ("testArrayInitHexPerformance", testArrayInitHexPerformance)
     ]
 }
 
@@ -235,7 +235,7 @@ extension HKDFTests {
         ("testHKDF3", testHKDF3),
         ("testHKDF4", testHKDF4),
         ("testHKDF5", testHKDF5),
-        ("testHKDF6", testHKDF6),
+        ("testHKDF6", testHKDF6)
     ]
 }
 
@@ -248,7 +248,7 @@ extension HMACTests {
         ("testSHA1", testSHA1),
         ("testSHA256", testSHA256),
         ("testSHA384", testSHA384),
-        ("testSHA512", testSHA512),
+        ("testSHA512", testSHA512)
     ]
 }
 
@@ -259,7 +259,7 @@ extension PBKDF {
     static let __allTests__PBKDF = [
         ("testPBKDF1", testPBKDF1),
         ("testPBKDF2", testPBKDF2),
-        ("testPBKDF2Length", testPBKDF2Length),
+        ("testPBKDF2Length", testPBKDF2Length)
     ]
 }
 
@@ -268,7 +268,7 @@ extension PBKDFPerf {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__PBKDFPerf = [
-        ("testPerformance", testPerformance),
+        ("testPerformance", testPerformance)
     ]
 }
 
@@ -281,7 +281,7 @@ extension PaddingTests {
         ("testPKCS7_1", testPKCS7_1),
         ("testPKCS7_2", testPKCS7_2),
         ("testZeroPadding1", testZeroPadding1),
-        ("testZeroPadding2", testZeroPadding2),
+        ("testZeroPadding2", testZeroPadding2)
     ]
 }
 
@@ -291,7 +291,7 @@ extension Poly1305Tests {
     // to regenerate.
     static let __allTests__Poly1305Tests = [
         ("testIssue183", testIssue183),
-        ("testPoly1305", testPoly1305),
+        ("testPoly1305", testPoly1305)
     ]
 }
 
@@ -302,7 +302,7 @@ extension RabbitTests {
     static let __allTests__RabbitTests = [
         ("testInitialization", testInitialization),
         ("testRabbitWithIV", testRabbitWithIV),
-        ("testRabbitWithoutIV", testRabbitWithoutIV),
+        ("testRabbitWithoutIV", testRabbitWithoutIV)
     ]
 }
 
@@ -311,7 +311,7 @@ extension RabbitTestsPerf {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__RabbitTestsPerf = [
-        ("testRabbitPerformance", testRabbitPerformance),
+        ("testRabbitPerformance", testRabbitPerformance)
     ]
 }
 
@@ -322,7 +322,7 @@ extension Scrypt {
     static let __allTests__Scrypt = [
         ("testScrypt_0", testScrypt_0),
         ("testScrypt_1", testScrypt_1),
-        ("testScrypt_2", testScrypt_2),
+        ("testScrypt_2", testScrypt_2)
     ]
 }
 
@@ -331,7 +331,7 @@ extension ScryptTestsPeft {
     //   `swift test --generate-linuxmain`
     // to regenerate.
     static let __allTests__ScryptTestsPeft = [
-        ("testScryptPerformance", testScryptPerformance),
+        ("testScryptPerformance", testScryptPerformance)
     ]
 }
 
@@ -360,7 +360,7 @@ public func __allTests() -> [XCTestCaseEntry] {
         testCase(RabbitTests.__allTests__RabbitTests),
         testCase(RabbitTestsPerf.__allTests__RabbitTestsPerf),
         testCase(Scrypt.__allTests__Scrypt),
-        testCase(ScryptTestsPeft.__allTests__ScryptTestsPeft),
+        testCase(ScryptTestsPeft.__allTests__ScryptTestsPeft)
     ]
 }
 #endif

+ 2 - 2
Tests/TestsPerformance/XCTestManifests.swift

@@ -7,13 +7,13 @@ extension TestsPerformance {
     // to regenerate.
     static let __allTests__TestsPerformance = [
         ("testExample", testExample),
-        ("testPerformanceExample", testPerformanceExample),
+        ("testPerformanceExample", testPerformanceExample)
     ]
 }
 
 public func __allTests() -> [XCTestCaseEntry] {
     return [
-        testCase(TestsPerformance.__allTests__TestsPerformance),
+        testCase(TestsPerformance.__allTests__TestsPerformance)
     ]
 }
 #endif

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.