Embrace #if canImport(Darwin)

Sources/CryptoSwift/Cryptors.swift

@@ -13,10 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 /// Worker cryptor/decryptor of `Updatable` types

Sources/CryptoSwift/HKDF.swift

@@ -16,10 +16,10 @@
 //  https://www.ietf.org/rfc/rfc5869.txt
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 /// A key derivation function.

Sources/CryptoSwift/Int+Extension.swift

@@ -14,10 +14,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 /* array of bits */

Sources/CryptoSwift/PKCS/PBKDF2.swift

@@ -16,10 +16,10 @@
 //  https://www.ietf.org/rfc/rfc2898.txt
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 public extension PKCS5 {

Sources/CryptoSwift/RandomBytesSequence.swift

@@ -13,10 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
-#else
+#if canImport(Darwin)
     import Darwin
+#else
+    import Glibc
 #endif
 
 struct RandomBytesSequence: Sequence {
@@ -24,8 +24,8 @@ struct RandomBytesSequence: Sequence {
 
     func makeIterator() -> AnyIterator<UInt8> {
         var count = 0
-        return AnyIterator<UInt8>.init({ () -> UInt8? in
-            if count >= self.size {
+        return AnyIterator<UInt8>.init { () -> UInt8? in
+            guard count < self.size else {
                 return nil
             }
             count = count + 1
@@ -45,6 +45,6 @@ struct RandomBytesSequence: Sequence {
             #else
                 return UInt8(arc4random_uniform(UInt32(UInt8.max) + 1))
             #endif
-        })
+        }
     }
 }

Sources/CryptoSwift/SHA3.swift

@@ -17,10 +17,10 @@
 //  http://keccak.noekeon.org/specs_summary.html
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 public final class SHA3: DigestType {

Sources/CryptoSwift/SecureBytes.swift

@@ -13,10 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 typealias Key = SecureBytes

Sources/CryptoSwift/UInt32+Extension.swift

@@ -13,10 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 protocol _UInt32Type {}

Sources/CryptoSwift/UInt8+Extension.swift

@@ -13,10 +13,10 @@
 //  - This notice may not be removed or altered from any source or binary distribution.
 //
 
-#if os(Linux) || os(Android) || os(FreeBSD)
-    import Glibc
+#if canImport(Darwin)
+import Darwin
 #else
-    import Darwin
+import Glibc
 #endif
 
 public protocol _UInt8Type {}