Rename bytes() to arrayOfBytes() due to ambiguity Array and UnsafePointer types (rdar://20517897) #51

CryptoSwift/AES.swift

@@ -126,7 +126,7 @@ public class AES {
     }
     
     convenience public init?(key:String, iv:String, blockMode:CipherBlockMode = .CBC) {
-        if let kkey = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.bytes(), let iiv = iv.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.bytes() {
+        if let kkey = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.arrayOfBytes(), let iiv = iv.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.arrayOfBytes() {
             self.init(key: kkey, iv: iiv, blockMode: blockMode)
         } else {
             self.init(key: [UInt8](), iv: [UInt8](), blockMode: blockMode) //FIXME: this is due Swift bug, remove this line later, when fixed

CryptoSwift/CRC.swift

@@ -45,14 +45,14 @@ class CRC {
     
     func crc32(message:NSData) -> NSData {
         var crc:UInt32 = 0xffffffff
-        for b in message.bytes() {
+        for b in message.arrayOfBytes() {
             var idx = Int((crc ^ UInt32(b)) & 0xff)
             crc = (crc >> 8) ^ table[idx]
         }
         crc = crc ^ 0xffffffff
         
         // reverse bytes
-        let bytes = NSMutableData(bytes: &crc, length: 4).bytes().reverse()
+        let bytes = NSMutableData(bytes: &crc, length: 4).arrayOfBytes().reverse()
         var data = NSData(bytes: bytes, length: bytes.count)
         return data
     }

CryptoSwift/ChaCha20.swift

@@ -33,7 +33,7 @@ public class ChaCha20 {
     }
     
     convenience public init?(key:String, iv:String) {
-        if let kkey = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.bytes(), let iiv = iv.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.bytes() {
+        if let kkey = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.arrayOfBytes(), let iiv = iv.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)?.arrayOfBytes() {
             self.init(key: kkey, iv: iiv)
         } else {
             self.init(key: [UInt8](), iv: [UInt8]()) //FIXME: this is due Swift bug, remove this line later, when fixed

CryptoSwift/HMAC.swift

@@ -31,15 +31,15 @@ public class HMAC {
         func calculateHash(# bytes:[UInt8]) -> [UInt8]? {
             switch (self) {
             case .sha1:
-                return NSData.withBytes(bytes).sha1()?.bytes()
+                return NSData.withBytes(bytes).sha1()?.arrayOfBytes()
             case .sha256:
-                return NSData.withBytes(bytes).sha256()?.bytes()
+                return NSData.withBytes(bytes).sha256()?.arrayOfBytes()
             case .sha384:
-                return NSData.withBytes(bytes).sha384()?.bytes()
+                return NSData.withBytes(bytes).sha384()?.arrayOfBytes()
             case .sha512:
-                return NSData.withBytes(bytes).sha512()?.bytes()
+                return NSData.withBytes(bytes).sha512()?.arrayOfBytes()
             case .md5:
-                return NSData.withBytes(bytes).md5()?.bytes();
+                return NSData.withBytes(bytes).md5()?.arrayOfBytes();
             }
         }
         

CryptoSwift/NSDataExtension.swift

@@ -22,7 +22,7 @@ extension NSData {
     public func checksum() -> UInt16 {
         var s:UInt32 = 0;
         
-        var bytesArray = self.bytes();
+        var bytesArray = self.arrayOfBytes()
         
         for (var i = 0; i < bytesArray.count; i++) {
             var b = bytesArray[i]
@@ -61,21 +61,21 @@ extension NSData {
     }
 
     public func encrypt(cipher: Cipher) -> NSData? {
-        if let encrypted = cipher.encrypt(self.bytes()) {
+        if let encrypted = cipher.encrypt(self.arrayOfBytes()) {
             return NSData.withBytes(encrypted)
         }
         return nil
     }
 
     public func decrypt(cipher: Cipher) -> NSData? {
-        if let decrypted = cipher.decrypt(self.bytes()) {
+        if let decrypted = cipher.decrypt(self.arrayOfBytes()) {
             return NSData.withBytes(decrypted)
         }
         return nil;
     }
     
     public func authenticate(authenticator: Authenticator) -> NSData? {
-        if let result = authenticator.authenticate(self.bytes()) {
+        if let result = authenticator.authenticate(self.arrayOfBytes()) {
             return NSData.withBytes(result)
         }
         return nil
@@ -100,7 +100,7 @@ extension NSData {
         return s;
     }
     
-    func bytes() -> [UInt8] {
+    public func arrayOfBytes() -> [UInt8] {
         let count = self.length / sizeof(UInt8)
         var bytesArray = [UInt8](count: count, repeatedValue: 0)
         self.getBytes(&bytesArray, length:count * sizeof(UInt8))

README.md

@@ -167,7 +167,7 @@ For you convenience CryptoSwift provide two function to easily convert array of
 
 ```swift
 let data  = NSData.withBytes([0x01,0x02,0x03])
-let bytes = data.bytes()
+let bytes:[UInt8] = data.arrayOfBytes()
 ```
 
 ##Contact