more code cleanup and refactor

CryptoSwift.xcodeproj/project.pbxproj

@@ -31,6 +31,7 @@
 		75B601EB197D6A6C0009B53D /* CryptoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 754BE45519693E190098E6F3 /* CryptoSwift.framework */; };
 		75D94E2419B60C08007CB2A4 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D94E2319B60C08007CB2A4 /* Operators.swift */; };
 		75D94E2619B60C4F007CB2A4 /* UInt32Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D94E2519B60C4F007CB2A4 /* UInt32Extension.swift */; };
+		75D94E2819B60DDE007CB2A4 /* UInt64Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D94E2719B60DDE007CB2A4 /* UInt64Extension.swift */; };
 		75EB380119ABDD710002375A /* ChaCha20.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75EB380019ABDD710002375A /* ChaCha20.swift */; };
 /* End PBXBuildFile section */
 
@@ -126,6 +127,7 @@
 		759D481019B517BC005FF7FC /* BitExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BitExtension.swift; sourceTree = "<group>"; };
 		75D94E2319B60C08007CB2A4 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
 		75D94E2519B60C4F007CB2A4 /* UInt32Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UInt32Extension.swift; sourceTree = "<group>"; };
+		75D94E2719B60DDE007CB2A4 /* UInt64Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UInt64Extension.swift; sourceTree = "<group>"; };
 		75EB380019ABDD710002375A /* ChaCha20.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChaCha20.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -194,6 +196,7 @@
 				758F3F771992F6CE0014BBDA /* ByteExtension.swift */,
 				7547195019931802002FA5F1 /* IntExtension.swift */,
 				75D94E2519B60C4F007CB2A4 /* UInt32Extension.swift */,
+				75D94E2719B60DDE007CB2A4 /* UInt64Extension.swift */,
 				75D94E2319B60C08007CB2A4 /* Operators.swift */,
 				752DEF7619693EA000E17557 /* NSDataExtension.swift */,
 				754C8FEC19979F94005AD904 /* ArrayExtension.swift */,
@@ -347,6 +350,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				75D94E2819B60DDE007CB2A4 /* UInt64Extension.swift in Sources */,
 				751C5C3D19B26B000094C75D /* Poly1305.swift in Sources */,
 				7552614E1993051E000D2B20 /* Hash.swift in Sources */,
 				7599C9C6199EA28700A3988B /* StringExtension.swift in Sources */,

CryptoSwift/ByteExtension.swift

@@ -8,8 +8,8 @@
 
 import Foundation
 
+/** Bits */
 extension Byte {
-
     init(bits: [Bit]) {
         var bitPattern:Byte = 0
         for (idx,b) in enumerate(bits) {
@@ -48,7 +48,10 @@ extension Byte {
         }
         return s
     }
+}
 
+/** Shift bits */
+extension Byte {
     /** Shift bits to the right. All bits are shifted (including sign bit) */
     mutating func shiftRight(count: Byte) -> Byte {
         if (self == 0) {

CryptoSwift/IntExtension.swift

@@ -33,14 +33,8 @@ j &<<= 2        //shift left and assign
 
 import Foundation
 
-extension UInt64 {
-    public func bytes(_ totalBytes: Int = sizeof(UInt64)) -> [Byte] {
-        return bytesArray(self, totalBytes)
-    }
-}
-
+/* array of bits */
 extension Int {
-    
     init(bits: [Bit]) {
         var bitPattern:UInt = 0
         for (idx,b) in enumerate(bits) {
@@ -52,7 +46,10 @@ extension Int {
         
         self.init(bitPattern: bitPattern)
     }
-    
+}
+
+/* array of bytes */
+extension Int {
     /** Array of bytes with optional padding (little-endian) */
     public func bytes(_ totalBytes: Int = sizeof(Int)) -> [Byte] {
         return bytesArray(self, totalBytes)
@@ -80,7 +77,7 @@ extension Int {
 
 
 
-/** Bit operations */
+/** Shift bits */
 extension Int {
     
     /** Shift bits to the left. All bits are shifted (including sign bit) */

CryptoSwift/UInt32Extension.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-/* bytes of array */
+/* array of bytes */
 extension UInt32 {
     public func bytes(_ totalBytes: Int = sizeof(UInt32)) -> [Byte] {
         return bytesArray(self, totalBytes)
@@ -38,7 +38,7 @@ extension UInt32 {
     }
 }
 
-/** Bit operations */
+/** Shift bits */
 extension UInt32 {
     
     /** Shift bits to the left. All bits are shifted (including sign bit) */

CryptoSwift/UInt64Extension.swift

@@ -0,0 +1,16 @@
+//
+//  UInt64Extension.swift
+//  CryptoSwift
+//
+//  Created by Marcin Krzyzanowski on 02/09/14.
+//  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
+//
+
+import Foundation
+
+/** array of bytes */
+extension UInt64 {
+    public func bytes(_ totalBytes: Int = sizeof(UInt64)) -> [Byte] {
+        return bytesArray(self, totalBytes)
+    }
+}