Merge pull request #182 from mattrubin/xcode-10

Fix compilation with Xcode 10 beta
mattrubin · Jun 7, 2018 · a1660a6 · a1660a6
2 parents a1bdada + 5364a18
commit a1660a6
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 8 deletions.
diff --git a/CommonCrypto/appletvos/module.modulemap b/CommonCrypto/appletvos/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/CommonCrypto/appletvsimulator/module.modulemap b/CommonCrypto/appletvsimulator/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform/Developer/SDKs/AppleTVSimulator.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/CommonCrypto/iphoneos/module.modulemap b/CommonCrypto/iphoneos/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/CommonCrypto/iphonesimulator/module.modulemap b/CommonCrypto/iphonesimulator/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/CommonCrypto/macosx/module.modulemap b/CommonCrypto/macosx/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/CommonCrypto/watchos/module.modulemap b/CommonCrypto/watchos/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/CommonCrypto/watchsimulator/module.modulemap b/CommonCrypto/watchsimulator/module.modulemap
@@ -1,4 +1,4 @@
-module CommonCrypto [system] {
+module CommonCryptoShim [system] {
     header "/Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform/Developer/SDKs/WatchSimulator.sdk/usr/include/CommonCrypto/CommonCrypto.h"
     export *
 }
diff --git a/Sources/Crypto.swift b/Sources/Crypto.swift
@@ -24,7 +24,15 @@
 //
 
 import Foundation
-import CommonCrypto
+#if swift(>=4.1)
+    #if canImport(CommonCrypto)
+        import CommonCrypto
+    #else
+        import CommonCryptoShim
+    #endif
+#else
+    import CommonCryptoShim
+#endif
 
 func HMAC(algorithm: Generator.Algorithm, key: Data, data: Data) -> Data {
     let (hashFunction, hashLength) = algorithm.hashInfo