Browse Source

keySetup -> contextSetup

Marcin Krzyżanowski 11 years ago
parent
commit
199808e7e6
1 changed files with 4 additions and 4 deletions
  1. 4 4
      CryptoSwift/ChaCha20.swift

+ 4 - 4
CryptoSwift/ChaCha20.swift

@@ -18,7 +18,7 @@ class ChaCha20 {
     }
     }
     
     
     init(key:NSData, iv:NSData) {
     init(key:NSData, iv:NSData) {
-        context = keySetup(iv: iv, key: key)
+        context = contextSetup(iv: iv, key: key)
     }
     }
 
 
     deinit
     deinit
@@ -67,11 +67,11 @@ class ChaCha20 {
         return output;
         return output;
     }
     }
     
     
-    private func keySetup(# iv:NSData, key:NSData, kbits:UInt32 = 256) -> Context {
-        return keySetup(iv: iv.arrayOfBytes(), key: key.arrayOfBytes(), kbits: kbits)
+    private func contextSetup(# iv:NSData, key:NSData, kbits:UInt32 = 256) -> Context {
+        return contextSetup(iv: iv.arrayOfBytes(), key: key.arrayOfBytes(), kbits: kbits)
     }
     }
     
     
-    private func keySetup(# iv:[Byte], key:[Byte], kbits:UInt32 = 256) -> Context {
+    private func contextSetup(# iv:[Byte], key:[Byte], kbits:UInt32 = 256) -> Context {
         var context = Context()
         var context = Context()
         
         
         // 4 - 8
         // 4 - 8