瀏覽代碼

Fixes after refactoring

Marcin Krzyżanowski 9 年之前
父節點
當前提交
154bb6702d
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 2 2
      Sources/CryptoSwift/AES.swift
  2. 1 1
      Sources/CryptoSwift/MD5.swift
  3. 1 1
      Sources/CryptoSwift/SHA1.swift

+ 2 - 2
Sources/CryptoSwift/AES.swift

@@ -114,7 +114,7 @@ extension AES {
     private func encryptBlock(block:Array<UInt8>) -> Array<UInt8>? {
         let rounds = self.variant.Nr
         let rk = self.expandedKey
-        var b = toUInt32Array(slice: block[block.startIndex..<block.endIndex])
+        var b = sliceToUInt32Array(block[block.startIndex..<block.endIndex])
 
         var t = Array<UInt32>(repeating: 0, count: 4)
 
@@ -178,7 +178,7 @@ extension AES {
     private func decryptBlock(block:Array<UInt8>) -> Array<UInt8>? {
         let rounds = self.variant.Nr
         let rk = expandedKeyInv
-        var b = toUInt32Array(slice: block[block.startIndex..<block.endIndex])
+        var b = sliceToUInt32Array(block[block.startIndex..<block.endIndex])
 
         var t = Array<UInt32>(repeating: 0, count: 4)
 

+ 1 - 1
Sources/CryptoSwift/MD5.swift

@@ -56,7 +56,7 @@ final class MD5 : HashProtocol  {
         let chunkSizeBytes = 512 / 8 // 64
         for chunk in BytesSequence(chunkSize: chunkSizeBytes, data: tmpMessage) {
             // break chunk into sixteen 32-bit words M[j], 0 ≤ j ≤ 15
-            var M = toUInt32Array(slice: chunk)
+            var M = sliceToUInt32Array(chunk)
             assert(M.count == 16, "Invalid array")
             
             // Initialize hash value for this chunk:

+ 1 - 1
Sources/CryptoSwift/SHA1.swift

@@ -36,7 +36,7 @@ final class SHA1 : HashProtocol {
                 case 0...15:
                     let start = chunk.startIndex + (x * sizeofValue(M[x]))
                     let end = start + sizeofValue(M[x])
-                    let le = toUInt32Array(slice: chunk[start..<end])[0]
+                    let le = sliceToUInt32Array(chunk[start..<end])[0]
                     M[x] = le.bigEndian
                     break
                 default: