calculate() return non-optional value (#2)

CryptoSwift/MD5.swift

@@ -35,13 +35,9 @@ public class MD5 : CryptoHashBase {
                        0xf7537e82,0xbd3af235,0x2ad7d2bb,0xeb86d391]
     
     private let h:[UInt32] = [0x67452301, 0xefcdab89, 0x98badcfe, 0x10325476]
-//    private let a0: UInt32 = 0x67452301
-//    private let b0: UInt32 = 0xefcdab89
-//    private let c0: UInt32 = 0x98badcfe
-//    private let d0: UInt32 = 0x10325476
     
     //MARK: Public
-    public func calculate() -> NSData? {
+    public func calculate() -> NSData {
         var tmpMessage = prepare()
         let wordSize = sizeof(UInt32)
 
@@ -118,12 +114,12 @@ public class MD5 : CryptoHashBase {
             buf.appendBytes(&i, length: sizeof(UInt32))
         })
         
-        return buf.copy() as? NSData;
+        return buf.copy() as NSData;
     }
 
     //MARK: Class
     
-    class func calculate(message: NSData) -> NSData?
+    class func calculate(message: NSData) -> NSData
     {
         return MD5(message).calculate();
     }

CryptoSwift/NSDataExtension.swift

@@ -36,11 +36,11 @@ extension NSData {
         return UInt16(s);
     }
     
-    public func md5() -> NSData? {
+    public func md5() -> NSData {
         return MD5(self).calculate()
     }
 
-    public func sha1() -> NSData? {
+    public func sha1() -> NSData {
         return SHA1(self).calculate()
     }
     

CryptoSwift/SHA1.swift

@@ -12,7 +12,7 @@ public class SHA1 : CryptoHashBase {
     
     private let h:[UInt32] = [0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0]
         
-    public func calculate() -> NSData? {
+    public func calculate() -> NSData {
         var tmpMessage = self.prepare()
         let wordSize = sizeof(UInt32)
         
@@ -99,6 +99,6 @@ public class SHA1 : CryptoHashBase {
             buf.appendBytes(&i, length: sizeof(UInt32))
         })
         
-        return buf.copy() as? NSData;
+        return buf.copy() as NSData;
     }    
 }

CryptoSwift/StringExtension.swift

@@ -13,17 +13,15 @@ extension String {
     
     /** Calculate MD5 hash */
     public func md5() -> String? {
-        var stringData = self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
-        if let hash = stringData!.md5() {
-            return hash.hexString
+        if let stringData = self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) {
+            return stringData.md5().hexString
         }
         return nil
     }
     
     public func sha1() -> String? {
-        var stringData = self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)
-        if let hash = stringData!.sha1() {
-            return hash.hexString
+        if let stringData = self.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false) {
+            return stringData.sha1().hexString
         }
         return nil
     }