Merge pull request #1065 from marcprux/master

Add Android support
krzyzanowskim · Jan 5, 2025 · 98e2219 · 98e2219
2 parents 3023636 + 1e30a61
commit 98e2219
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 0 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -0,0 +1,21 @@
+name: Android
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Run tests
+      uses: skiptools/swift-android-action@v2
diff --git a/Sources/CryptoSwift/BlockMode/CCM.swift b/Sources/CryptoSwift/BlockMode/CCM.swift
@@ -19,6 +19,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/Cryptors.swift b/Sources/CryptoSwift/Cryptors.swift
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/HKDF.swift b/Sources/CryptoSwift/HKDF.swift
@@ -18,6 +18,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/Int+Extension.swift b/Sources/CryptoSwift/Int+Extension.swift
@@ -16,6 +16,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/PKCS/PBKDF2.swift b/Sources/CryptoSwift/PKCS/PBKDF2.swift
@@ -18,6 +18,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/SHA3.swift b/Sources/CryptoSwift/SHA3.swift
@@ -19,6 +19,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/SecureBytes.swift b/Sources/CryptoSwift/SecureBytes.swift
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)
@@ -39,6 +41,8 @@ final class SecureBytes {
         VirtualLock(UnsafeMutableRawPointer(mutating: pointer.baseAddress), SIZE_T(pointer.count))
       #elseif os(WASI)
         // not supported on WASI
+      #elseif os(Android)
+        mlock(pointer.baseAddress!, pointer.count)
       #else
         mlock(pointer.baseAddress, pointer.count)
       #endif
@@ -51,6 +55,8 @@ final class SecureBytes {
         VirtualUnlock(UnsafeMutableRawPointer(mutating: pointer.baseAddress), SIZE_T(pointer.count))
       #elseif os(WASI)
         // not supported on WASI
+      #elseif os(Android)
+        munlock(pointer.baseAddress!, pointer.count)
       #else
         munlock(pointer.baseAddress, pointer.count)
       #endif

diff --git a/Sources/CryptoSwift/UInt32+Extension.swift b/Sources/CryptoSwift/UInt32+Extension.swift
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

diff --git a/Sources/CryptoSwift/UInt8+Extension.swift b/Sources/CryptoSwift/UInt8+Extension.swift
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)