Digest -> DigestType. Hash -> Digest

CryptoSwift.xcodeproj/project.pbxproj

@@ -37,7 +37,7 @@
 		757BC9681C1CA5790093AAA9 /* CSArrayType+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC9251C1CA5790093AAA9 /* CSArrayType+Extensions.swift */; };
 		757BC96C1C1CA5790093AAA9 /* Generics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC9261C1CA5790093AAA9 /* Generics.swift */; };
 		757BC9701C1CA5790093AAA9 /* Hash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC9271C1CA5790093AAA9 /* Hash.swift */; };
-		757BC9741C1CA5790093AAA9 /* Digest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC9281C1CA5790093AAA9 /* Digest.swift */; };
+		757BC9741C1CA5790093AAA9 /* DigestType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC9281C1CA5790093AAA9 /* DigestType.swift */; };
 		757BC9781C1CA5790093AAA9 /* HMAC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC9291C1CA5790093AAA9 /* HMAC.swift */; };
 		757BC9801C1CA5790093AAA9 /* IntegerConvertible.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC92B1C1CA5790093AAA9 /* IntegerConvertible.swift */; };
 		757BC9841C1CA5790093AAA9 /* Int+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 757BC92C1C1CA5790093AAA9 /* Int+Extension.swift */; };
@@ -184,7 +184,7 @@
 		757BC9251C1CA5790093AAA9 /* CSArrayType+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = "CSArrayType+Extensions.swift"; path = "Sources/CryptoSwift/CSArrayType+Extensions.swift"; sourceTree = SOURCE_ROOT; };
 		757BC9261C1CA5790093AAA9 /* Generics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Generics.swift; path = Sources/CryptoSwift/Generics.swift; sourceTree = SOURCE_ROOT; };
 		757BC9271C1CA5790093AAA9 /* Hash.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Hash.swift; path = Sources/CryptoSwift/Hash.swift; sourceTree = SOURCE_ROOT; };
-		757BC9281C1CA5790093AAA9 /* Digest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Digest.swift; path = Sources/CryptoSwift/Digest.swift; sourceTree = SOURCE_ROOT; };
+		757BC9281C1CA5790093AAA9 /* DigestType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DigestType.swift; path = Sources/CryptoSwift/DigestType.swift; sourceTree = SOURCE_ROOT; };
 		757BC9291C1CA5790093AAA9 /* HMAC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HMAC.swift; path = Sources/CryptoSwift/HMAC.swift; sourceTree = SOURCE_ROOT; };
 		757BC92A1C1CA5790093AAA9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/CryptoSwift/Info.plist; sourceTree = SOURCE_ROOT; };
 		757BC92B1C1CA5790093AAA9 /* IntegerConvertible.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = IntegerConvertible.swift; path = Sources/CryptoSwift/IntegerConvertible.swift; sourceTree = SOURCE_ROOT; };
@@ -301,7 +301,7 @@
 				757BC9231C1CA5790093AAA9 /* Checksum.swift */,
 				757BC9261C1CA5790093AAA9 /* Generics.swift */,
 				757BC9271C1CA5790093AAA9 /* Hash.swift */,
-				757BC9281C1CA5790093AAA9 /* Digest.swift */,
+				757BC9281C1CA5790093AAA9 /* DigestType.swift */,
 				757BC9291C1CA5790093AAA9 /* HMAC.swift */,
 				757BC92B1C1CA5790093AAA9 /* IntegerConvertible.swift */,
 				757BC92D1C1CA5790093AAA9 /* MD5.swift */,
@@ -546,7 +546,7 @@
 				757BC9C01C1CA5790093AAA9 /* Utils.swift in Sources */,
 				75CB93491C8F60700087740D /* ECB.swift in Sources */,
 				757F440E1CC1822B002B1F85 /* SecureBytes.swift in Sources */,
-				757BC9741C1CA5790093AAA9 /* Digest.swift in Sources */,
+				757BC9741C1CA5790093AAA9 /* DigestType.swift in Sources */,
 				750D3ACB1D0EADCA00999299 /* ZeroPadding.swift in Sources */,
 				756B575F1D5131A4001C0C72 /* Collection+Extension.swift in Sources */,
 				757BC90E1C1CA56A0093AAA9 /* Rabbit+Foundation.swift in Sources */,

Sources/CryptoSwift/CSArrayType+Extensions.swift

@@ -30,27 +30,27 @@ public extension CSArrayType where Iterator.Element == UInt8 {
 
 public extension CSArrayType where Iterator.Element == UInt8 {
     public func md5() -> [Iterator.Element] {
-        return Hash.md5(cs_arrayValue())
+        return Digest.md5(cs_arrayValue())
     }
     
     public func sha1() -> [Iterator.Element] {
-        return Hash.sha1(cs_arrayValue())
+        return Digest.sha1(cs_arrayValue())
     }
     
     public func sha224() -> [Iterator.Element] {
-        return Hash.sha224(cs_arrayValue())
+        return Digest.sha224(cs_arrayValue())
     }
     
     public func sha256() -> [Iterator.Element] {
-        return Hash.sha256(cs_arrayValue())
+        return Digest.sha256(cs_arrayValue())
     }
     
     public func sha384() -> [Iterator.Element] {
-        return Hash.sha384(cs_arrayValue())
+        return Digest.sha384(cs_arrayValue())
     }
     
     public func sha512() -> [Iterator.Element] {
-        return Hash.sha512(cs_arrayValue())
+        return Digest.sha512(cs_arrayValue())
     }
     
     public func crc32(seed: UInt32? = nil, reflect : Bool = true) -> UInt32 {

Sources/CryptoSwift/Digest.swift → Sources/CryptoSwift/DigestType.swift

@@ -6,4 +6,4 @@
 //  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
 //
 
-internal protocol Digest { }
+internal protocol DigestType { }

Sources/CryptoSwift/Foundation/Data+Extension.swift

@@ -22,17 +22,17 @@ extension Data {
     }
     
     public func md5() -> Data {
-        let result = Hash.md5(self.bytes)
+        let result = Digest.md5(self.bytes)
         return Data(bytes: result)
     }
 
     public func sha1() -> Data? {
-        let result = Hash.sha1(self.bytes)
+        let result = Digest.sha1(self.bytes)
         return Data(bytes: result)
     }
 
     public func sha224() -> Data? {
-        let result = Hash.sha224(self.bytes)
+        let result = Digest.sha224(self.bytes)
         return Data(bytes: result)
     }
 
@@ -42,12 +42,12 @@ extension Data {
     }
 
     public func sha384() -> Data? {
-        let result = Hash.sha384(self.bytes)
+        let result = Digest.sha384(self.bytes)
         return Data(bytes: result)
     }
 
     public func sha512() -> Data? {
-        let result = Hash.sha512(self.bytes)
+        let result = Digest.sha512(self.bytes)
         return Data(bytes: result)
     }
 

Sources/CryptoSwift/HMAC.swift

@@ -33,15 +33,15 @@ final public class HMAC: Authenticator {
         func calculateHash(_ bytes:Array<UInt8>) -> Array<UInt8>? {
             switch (self) {
             case .sha1:
-                return Hash.sha1(bytes)
+                return Digest.sha1(bytes)
             case .sha256:
-                return Hash.sha256(bytes)
+                return Digest.sha256(bytes)
             case .sha384:
-                return Hash.sha384(bytes)
+                return Digest.sha384(bytes)
             case .sha512:
-                return Hash.sha512(bytes)
+                return Digest.sha512(bytes)
             case .md5:
-                return Hash.md5(bytes)
+                return Digest.md5(bytes)
             }
         }
         

Sources/CryptoSwift/Hash.swift

@@ -6,7 +6,9 @@
 //  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
 //
 
-public struct Hash {
+typealias Hash = Digest
+
+public struct Digest {
     public static func md5(_ bytes: Array<UInt8>) -> Array<UInt8> {
         return MD5(bytes).calculate()
     }

Sources/CryptoSwift/MD5.swift

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
 //
 
-final class MD5 : Digest  {
+final class MD5: DigestType  {
     static let size:Int = 16 // 128 / 8
     let message: Array<UInt8>
     

Sources/CryptoSwift/PKCS5/PBKDF1.swift

@@ -35,9 +35,9 @@ public extension PKCS5 {
             fileprivate func calculateHash(_ bytes:Array<UInt8>) -> Array<UInt8>? {
                 switch (self) {
                 case .sha1:
-                    return Hash.sha1(bytes)
+                    return Digest.sha1(bytes)
                 case .md5:
-                    return Hash.md5(bytes)
+                    return Digest.md5(bytes)
                 }
             }
         }

Sources/CryptoSwift/SHA1.swift

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
 //
 
-final class SHA1 : Digest {
+final class SHA1: DigestType {
     static let size:Int = 20 // 160 / 8
     let message: Array<UInt8>
     

Sources/CryptoSwift/SHA2.swift

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Marcin Krzyzanowski. All rights reserved.
 //
 
-final class SHA2 : Digest {
+final class SHA2: DigestType {
     var size:Int { return variant.rawValue }
     let variant: Variant