Browse Source

Merge branch 'master' into develop

Marcin Krzyżanowski 10 years ago
parent
commit
853cbe06b6
4 changed files with 7 additions and 4 deletions
  1. 1 1
      CryptoSwift.podspec
  2. 1 1
      CryptoSwift/Foundation/NSData+Extension.swift
  3. 1 1
      CryptoSwift/Info.plist
  4. 4 1
      README.md

+ 1 - 1
CryptoSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
   s.name         = "CryptoSwift"
   s.name         = "CryptoSwift"
-  s.version      = "0.0.15"
+  s.version      = "0.0.16"
   s.summary      = "Cryptography in Swift. SHA, MD5, CRC, Poly1305, HMAC, ChaCha20, AES."
   s.summary      = "Cryptography in Swift. SHA, MD5, CRC, Poly1305, HMAC, ChaCha20, AES."
   s.description  = "Cryptography functions and helpers for Swift implemented in Swift. SHA, MD5, CRC, Poly1305, HMAC, ChaCha20, AES."
   s.description  = "Cryptography functions and helpers for Swift implemented in Swift. SHA, MD5, CRC, Poly1305, HMAC, ChaCha20, AES."
   s.homepage     = "https://github.com/krzyzanowskim/CryptoSwift"
   s.homepage     = "https://github.com/krzyzanowskim/CryptoSwift"

+ 1 - 1
CryptoSwift/Foundation/NSData+Extension.swift

@@ -30,7 +30,7 @@ extension NSData {
         return UInt16(s)
         return UInt16(s)
     }
     }
     
     
-    public func md5() -> NSData? {
+    @nonobjc public func md5() -> NSData? {
         guard let result = Hash.md5(self.arrayOfBytes()).calculate() else { return nil }
         guard let result = Hash.md5(self.arrayOfBytes()).calculate() else { return nil }
         return NSData.withBytes(result)
         return NSData.withBytes(result)
     }
     }

+ 1 - 1
CryptoSwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.13</string>
+	<string>0.0.16</string>
 	<key>CFBundleSignature</key>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<key>CFBundleVersion</key>

+ 4 - 1
README.md

@@ -62,7 +62,7 @@ To install CryptoSwift, add it as a submodule to your project (on the top level
 
 
 	git submodule add https://github.com/krzyzanowskim/CryptoSwift.git
 	git submodule add https://github.com/krzyzanowskim/CryptoSwift.git
 
 
-Then, drag the CryptoSwift.xcodeproj file into your Xcode project, and add CryptoSwift.framework as a dependency to your target.
+Then, drag the CryptoSwift.xcodeproj file into your Xcode project, and add CryptoSwift.framework as a dependency to your target. Now select your App and choose the General tab for the app target. Drag CryptoSwift.framework to "Embedded Binaries"
 
 
 Alternatively, you can build the Universal Framework and link it in your Xcode project. 
 Alternatively, you can build the Universal Framework and link it in your Xcode project. 
 Aggregate target `CryptoSwift-Universal` runs a script to build a universal framework. The script currently copies the framework to the `Framework` directory. (The path to CryptoSwift directory cannot contain any space)
 Aggregate target `CryptoSwift-Universal` runs a script to build a universal framework. The script currently copies the framework to the `Framework` directory. (The path to CryptoSwift directory cannot contain any space)
@@ -218,6 +218,9 @@ Permission is granted to anyone to use this software for any purpose, including
 
 
 ##Changelog
 ##Changelog
 
 
+0.0.16
+- Critical fix for private "md5" selector issue (#135)
+
 0.0.15
 0.0.15
 - Fix 32-bit CTR block mode
 - Fix 32-bit CTR block mode
 - Carthage support update
 - Carthage support update