Remove CommonCrypto framework

CommonCrypto.framework/CommonCrypto

@@ -1 +0,0 @@
-Versions/Current/CommonCrypto

CommonCrypto.framework/Headers

@@ -1 +0,0 @@
-Versions/Current/Headers

CommonCrypto.framework/Modules

@@ -1 +0,0 @@
-Versions/Current/Modules

CommonCrypto.framework/Resources

@@ -1 +0,0 @@
-Versions/Current/Resources

CommonCrypto.framework/Versions/A/Headers/CommonCrypto.h

@@ -1,19 +0,0 @@
-//
-//  CommonCrypto.h
-//  CommonCrypto
-//
-//  Created by Rob Napier on 6/12/15.
-//  Copyright © 2015 Rob Napier. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for CommonCrypto.
-FOUNDATION_EXPORT double CommonCryptoVersionNumber;
-
-//! Project version string for CommonCrypto.
-FOUNDATION_EXPORT const unsigned char CommonCryptoVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <CommonCrypto/PublicHeader.h>
-
-

CommonCrypto.framework/Versions/A/Modules/module.modulemap

@@ -1,4 +0,0 @@
-module CommonCrypto [system] {
-    header "/usr/include/CommonCrypto/CommonCrypto.h"
-    export *
-}

CommonCrypto.framework/Versions/A/Resources/Info.plist

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>14F27</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>CommonCrypto</string>
-	<key>CFBundleIdentifier</key>
-	<string>net.robnapier.CommonCrypto</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>CommonCrypto</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>7A1001</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>15A278</string>
-	<key>DTSDKName</key>
-	<string>macosx10.11</string>
-	<key>DTXcode</key>
-	<string>0701</string>
-	<key>DTXcodeBuild</key>
-	<string>7A1001</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-		<integer>2</integer>
-	</array>
-</dict>
-</plist>

CommonCrypto.framework/Versions/Current

@@ -1 +0,0 @@
-A

CommonCrypto/CommonCrypto-Pod.modulemap

@@ -1,11 +0,0 @@
-framework module RNCryptor {
-  umbrella header "RNCryptor.h"
-
-  export *
-  module * { export * }
-}
-
-module CommonCrypto [system] {
-    header "/usr/include/CommonCrypto/CommonCrypto.h"
-    export *
-}

CommonCrypto/CommonCrypto.c

@@ -1,8 +0,0 @@
-/* Something to compile so CocoaPods is happy */
-
-#include "CommonCrypto.h"
-
-int main(int argc, char const *argv[])
-{
-  return 0;
-}

CommonCrypto/CommonCrypto.h

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2006-2012 Apple, Inc. All Rights Reserved.
- *
- * @APPLE_LICENSE_HEADER_START@
- *
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
- *
- * @APPLE_LICENSE_HEADER_END@
- */
-
-#ifndef __COMMONCRYPTO_PUBLIC__
-#define __COMMONCRYPTO_PUBLIC__
-
-#include <CommonCrypto/CommonCryptor.h>
-#include <CommonCrypto/CommonDigest.h>
-#include <CommonCrypto/CommonHMAC.h>
-#include <CommonCrypto/CommonKeyDerivation.h>
-#include <CommonCrypto/CommonSymmetricKeywrap.h>
-
-#endif /* __COMMONCRYPTO_PUBLIC__ */

CommonCrypto/CommonCrypto.modulemap

@@ -1,4 +0,0 @@
-module CommonCrypto [system] {
-    header "/usr/include/CommonCrypto/CommonCrypto.h"
-    export *
-}

CommonCrypto/CommonCrypto.xcconfig

@@ -1 +0,0 @@
-MODULEMAP_FILE = $(SRCROOT)/CommonCrypto/CommonCrypto.modulemap

CommonCrypto/Info.plist

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>

README.md

@@ -154,15 +154,9 @@ if (error != nil) {
 
 RNCryptor 4 is written in Swift 2, so requires Xcode 7, and can target iOS 7 or later (iOS 8 or later if used as a framework), and OS X 10.9 or later. If you want a pure ObjC implementation that supports older versions of iOS and OS X, see [RNCryptor 3](https://github.com/RNCryptor/RNCryptor/releases/tag/RNCryptor-3.0.1).
 
-### A word about CommonCrypto
-
-CommonCrypto hates Swift. That may be an overstatment. CommonCrypto is...apathetic about Swift to the point of hostility. Apple only needs to do a few things to make CommonCrypto a fine Swift citizen, but as of Xcode 7, those things have not happened, and this makes it difficult to import CommonCrypto into Swift projects.
-
-The most critical thing is that CommonCrypto is not a module, and Swift can't really handle things that aren't modules. The RNCryptor project comes with `CommonCrypto.framework`, which is basically a fake module. Its only function is to tell Swift where the CommonCrypto headers live. It doesn't contain any CommonCrypto code. You don't even need to link it. For maximum robustness across Xcode versions, `CommonCrypto.framework` points to `/usr/include`. The CommonCrypto headers change very rarely, so this shouldn't cause any problem. Hopefully Apple will finally make a module around CommonCrypto and this won't be necessary in the future.
-
 ### Installing as a subproject
 
-The easiest way to use RNCryptor is as a subproject without a framework. RNCryptor is just one file, and you can skip all the complexity of managing frameworks this way. It also makes version control very simple if you use submodules, or checkin specific versions of RNCryptor to your repository.
+The easiest way to use RNCryptor is as a subproject without a framework. RNCryptor is just one swift file and one bridging header, and you can skip all the complexity of managing frameworks this way. It also makes version control very simple if you use submodules, or checkin specific versions of RNCryptor to your repository.
 
 This process works for most targets: iOS and OS X GUI apps, Swift frameworks, and OS X commandline apps. **It is not safe for ObjC frameworks or frameworks that may be imported into ObjC, since it would cause duplicate symbols if some other framework includes RNCryptor.**
 

RNCryptor.xcodeproj/project.pbxproj

@@ -47,12 +47,6 @@
 /* Begin PBXFileReference section */
 		FB1E41121BBABEB10009A47D /* ObjC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjC.m; sourceTree = "<group>"; };
 		FB30A1FE1B2B7BF300BE5429 /* RNCryptor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNCryptor.swift; sourceTree = "<group>"; };
-		FB30A2071B2B86FD00BE5429 /* CommonCrypto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonCrypto.h; sourceTree = "<group>"; };
-		FB30A2091B2B86FD00BE5429 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		FB30A21C1B2B873000BE5429 /* CommonCrypto.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = CommonCrypto.xcconfig; sourceTree = "<group>"; };
-		FB30A21D1B2B876600BE5429 /* iphoneos.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = iphoneos.modulemap; sourceTree = "<group>"; };
-		FB30A21E1B2B878300BE5429 /* iphonesimulator.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = iphonesimulator.modulemap; sourceTree = "<group>"; };
-		FB30A21F1B2B879000BE5429 /* macosx.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = macosx.modulemap; sourceTree = "<group>"; };
 		FB364F5C1B41F0E100F5273F /* GenVectorTests */ = {isa = PBXFileReference; lastKnownFileType = text; path = GenVectorTests; sourceTree = "<group>"; };
 		FB36507E1B41F3DE00F5273F /* RNCryptorGeneratedVectorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNCryptorGeneratedVectorTests.swift; sourceTree = "<group>"; };
 		FB3650801B41F49800F5273F /* VectorTestHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VectorTestHelpers.swift; sourceTree = "<group>"; };
@@ -103,19 +97,6 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		FB30A2061B2B86FD00BE5429 /* CommonCrypto */ = {
-			isa = PBXGroup;
-			children = (
-				FB30A2071B2B86FD00BE5429 /* CommonCrypto.h */,
-				FB30A2091B2B86FD00BE5429 /* Info.plist */,
-				FB30A21C1B2B873000BE5429 /* CommonCrypto.xcconfig */,
-				FB30A21D1B2B876600BE5429 /* iphoneos.modulemap */,
-				FB30A21E1B2B878300BE5429 /* iphonesimulator.modulemap */,
-				FB30A21F1B2B879000BE5429 /* macosx.modulemap */,
-			);
-			path = CommonCrypto;
-			sourceTree = "<group>";
-		};
 		FB36501F1B41F3DE00F5273F /* Generated */ = {
 			isa = PBXGroup;
 			children = (
@@ -139,7 +120,6 @@
 				FB45A37E1BBB713B00265FD1 /* README.md */,
 				FB627FD01B2B7A1700C3A579 /* RNCryptor */,
 				FB627FDC1B2B7A1800C3A579 /* RNCryptorTests */,
-				FB30A2061B2B86FD00BE5429 /* CommonCrypto */,
 				FB627FCF1B2B7A1700C3A579 /* Products */,
 			);
 			sourceTree = "<group>";