Răsfoiți Sursa

Merge branch 'master' into develop

Marcin Krzyżanowski 10 ani în urmă
părinte
comite
01cb67c26f
3 a modificat fișierele cu 28 adăugiri și 9 ștergeri
  1. 1 1
      CryptoSwift.podspec
  2. 4 2
      CryptoSwift.xcodeproj/project.pbxproj
  3. 23 6
      README.md

+ 1 - 1
CryptoSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CryptoSwift"
-  s.version      = "0.0.14"
+  s.version      = "0.0.15"
   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.homepage     = "https://github.com/krzyzanowskim/CryptoSwift"

+ 4 - 2
CryptoSwift.xcodeproj/project.pbxproj

@@ -553,7 +553,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -600,7 +600,7 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 1;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -625,6 +625,7 @@
 		754BE46C19693E190098E6F3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -649,6 +650,7 @@
 		754BE46D19693E190098E6F3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;

+ 23 - 6
README.md

@@ -1,6 +1,18 @@
 #CryptoSwift
+
 Crypto related functions and helpers for [Swift](https://developer.apple.com/swift/) implemented in Swift. ([#PureSwift](https://twitter.com/hashtag/pureswift))
 
+-------
+<p align="center">
+    <a href="#features">Features</a> &bull;
+    <a href="#contribution">Contribution</a> &bull;
+    <a href="#installation">Installation</a> &bull;
+    <a href="#usage">Usage</a> &bull; 
+    <a href="#author">Author</a> &bull;
+    <a href="#changelog">Changelog</a>
+</p>
+-------
+
 ##Requirements
 Good mood
 
@@ -9,7 +21,7 @@ Good mood
 - Easy to use
 - Convenience extensions
 
-###What implemented?
+##What implemented?
 
 #### Hash
 - [MD5](http://tools.ietf.org/html/rfc1321)
@@ -37,10 +49,10 @@ Good mood
 #####Data padding
 - [PKCS#7](http://tools.ietf.org/html/rfc5652#section-6.3)
 
-###Why
+##Why
 [Why?](https://github.com/krzyzanowskim/CryptoSwift/issues/5) [Because I can](https://github.com/krzyzanowskim/CryptoSwift/issues/5#issuecomment-53379391).
 
-###Contribution
+##Contribution
 
 For latest version, please check **develop** branch. This is latest development version that will be merged into **master** branch at some point.
 
@@ -186,8 +198,10 @@ let data  = NSData.withBytes([0x01,0x02,0x03])
 let bytes:[UInt8] = data.arrayOfBytes()
 ```
 
-##Contact
-Marcin Krzyżanowski [@krzyzanowskim](http://twitter.com/krzyzanowskim)
+##Author
+[Marcin Krzyżanowski](http://www.krzyzanowskim.com)
+
+T: [@krzyzanowskim](http://twitter.com/krzyzanowskim)
 
 ##License
 
@@ -204,7 +218,10 @@ Permission is granted to anyone to use this software for any purpose, including
 
 ##Changelog
 
-This is not full changelog
+0.0.15
+- Fix 32-bit CTR block mode
+- Carthage support update
+- Mark as App-Extension-Safe API
 
 0.0.14
 - hexString -> toHextString() #105