Merge branch 'master' into develop

CryptoSwift.podspec

@@ -14,6 +14,8 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.9"
   s.watchos.platform = :watchos, '2.0'
   s.watchos.deployment_target = "2.0"
+  s.tvos.platform = :tvos, '9.0'
+  s.tvos.deployment_target = "9.0"
   s.source_files  = "CryptoSwift/**/*.swift"
   s.requires_arc = true
 end

CryptoSwift.xcodeproj/project.pbxproj

@@ -7,6 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		21C68D4F1C0BA77500D2B00A /* CryptoSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 21C68D4E1C0BA77500D2B00A /* CryptoSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		21C68D501C0BA77500D2B00A /* CryptoSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 21C68D4E1C0BA77500D2B00A /* CryptoSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		21C68D511C0BA77500D2B00A /* CryptoSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 21C68D4E1C0BA77500D2B00A /* CryptoSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		21C68D521C0BA77500D2B00A /* CryptoSwift.h in Headers */ = {isa = PBXBuildFile; fileRef = 21C68D4E1C0BA77500D2B00A /* CryptoSwift.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5596BDC31BC8F384007E38D5 /* AES+Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75FB9C951BB8A4BD009CAFC5 /* AES+Foundation.swift */; };
 		5596BDC41BC8F384007E38D5 /* ArrayUInt8+Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75FB9C961BB8A4BD009CAFC5 /* ArrayUInt8+Foundation.swift */; };
 		5596BDC51BC8F384007E38D5 /* ChaCha20+Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75FB9C971BB8A4BD009CAFC5 /* ChaCha20+Foundation.swift */; };
@@ -253,6 +257,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		21C68D4E1C0BA77500D2B00A /* CryptoSwift.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoSwift.h; sourceTree = "<group>"; };
 		5596BDBB1BC8F220007E38D5 /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		674A73661BF4E08C00866C5B /* Rabbit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Rabbit.swift; sourceTree = "<group>"; };
 		674A736E1BF5D85B00866C5B /* RabbitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RabbitTests.swift; sourceTree = "<group>"; };
@@ -384,6 +389,7 @@
 		754BE45719693E190098E6F3 /* CryptoSwift */ = {
 			isa = PBXGroup;
 			children = (
+				21C68D4E1C0BA77500D2B00A /* CryptoSwift.h */,
 				75FB9C941BB8A4BD009CAFC5 /* Foundation */,
 				7552614D1993051E000D2B20 /* Hash.swift */,
 				7563B2E719B14D4300B152CD /* Cipher.swift */,
@@ -476,6 +482,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				21C68D501C0BA77500D2B00A /* CryptoSwift.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -483,6 +490,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				21C68D4F1C0BA77500D2B00A /* CryptoSwift.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -490,6 +498,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				21C68D511C0BA77500D2B00A /* CryptoSwift.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -497,6 +506,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				21C68D521C0BA77500D2B00A /* CryptoSwift.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -609,7 +619,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 0700;
+				LastUpgradeCheck = 0710;
 				ORGANIZATIONNAME = "Marcin Krzyzanowski";
 				TargetAttributes = {
 					5596BDBA1BC8F220007E38D5 = {
@@ -984,6 +994,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1033,6 +1044,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1213,6 +1225,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
+				COMBINE_HIDPI_IMAGES = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
@@ -1236,6 +1249,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
+				COMBINE_HIDPI_IMAGES = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";

CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift OSX.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CryptoSwift.xcodeproj/xcshareddata/xcschemes/CryptoSwift watchOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CryptoSwift/CryptoSwift.h

@@ -0,0 +1,15 @@
+//
+//  CryptoSwift.h
+//  CryptoSwift
+//
+//  Created by Sam Soffes on 11/29/15.
+//  Copyright © 2015 Marcin Krzyzanowski. All rights reserved.
+//
+
+@import Foundation;
+
+//! Project version number for CryptoSwift.
+FOUNDATION_EXPORT double CryptoSwiftVersionNumber;
+
+//! Project version string for CryptoSwift.
+FOUNDATION_EXPORT const unsigned char CryptoSwiftVersionString[];

README.md

@@ -70,14 +70,19 @@ To install CryptoSwift, add it as a submodule to your project (on the top level
 
 ####Embedded Framework
 
-Embedded frameworks require a minimum deployment target of iOS 8 or OS X Mavericks (10.9). Drag the `CryptoSwift.xcodeproj` file into your Xcode project, and add appropriate framework as a dependency to your target. Now select your App and choose the General tab for the app target. Drag framework to *Embedded Binaries*
+Embedded frameworks require a minimum deployment target of iOS 8 or OS X Mavericks (10.9). Drag the `CryptoSwift.xcodeproj` file into your Xcode project, and add appropriate framework as a dependency to your target. Now select your App and choose the General tab for the app target. Find *Embedded Binaries* and press "+", then select `CryptoSwift.framework` (iOS, OS X, watchOS or tvOS)
 
-#####iOS, OSX, watchOS
+![](https://cloud.githubusercontent.com/assets/758033/10834511/25a26852-7e9a-11e5-8c01-6cc8f1838459.png)
+
+
+
+#####iOS, OSX, watchOS, tvOS
 
 In the project, you'll find three targets, configured for each supported SDK:
 - CryptoSwift iOS
 - CryptoSwift OSX
 - CryptoSwift watchOS
+- CryptoSwift tvOS
 
 You may need to choose the one you need to build `CryptoSwift.framework` for your application.
 
@@ -277,4 +282,4 @@ Permission is granted to anyone to use this software for any purpose, including
 
 ##Changelog
 
-see CHANGELOG file
+See [CHANGELOG](./CHANGELOG) file.