[android] Use tutasdk for argon2id; ~() all C++ code

Remove dependency on phc-winner-argon2 and all C++ code. Add NDK installation to kotlin-test.yml. Before, this was held together with duct tape, and removing the CMakeLists.txt also removed the duct tape, causing CI to complain about no NDK installed even though it was somehow fine before... Co-authored-by: wec43 <[email protected]>
tutao · Aug 15, 2024 · b959e15 · b959e15
1 parent cbcf99c
commit b959e15
Show file tree

Hide file tree

Showing 20 changed files with 8 additions and 688 deletions.
diff --git a/.github/workflows/kotlin-test.yml b/.github/workflows/kotlin-test.yml
@@ -46,6 +46,8 @@ jobs:
           distribution: ${{ env.java-distribution }}
       - name: Setup Android SDK
         uses: android-actions/setup-android@07976c6290703d34c16d382cb36445f98bb43b1f #3.2.0
+      - name: Setup Android NDK
+        run: sdkmanager "ndk;26.1.10909125"
       - name: Setup Rust targets
         run: rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
       - name: Lint

diff --git a/app-android/app/build.gradle b/app-android/app/build.gradle
@@ -22,11 +22,6 @@ android {
 			arg("room.schemaLocation", "$projectDir/schemas".toString())
 			arg("room.generateKotlin", "true")
 		}
-		externalNativeBuild {
-			cmake {
-				cppFlags ''
-			}
-		}
 	}
 	signingConfigs {
 		release {
@@ -114,12 +109,6 @@ android {
 	}
 
 	namespace 'de.tutao.tutanota'
-	externalNativeBuild {
-		cmake {
-			path file('src/main/cpp/CMakeLists.txt')
-			version "3.18.0+"
-		}
-	}
 }
 
 tasks.withType(Test).configureEach {

diff --git a/app-android/app/src/androidTest/java/de/tutao/tutanota/EncryptionCompatTest.kt b/app-android/app/src/androidTest/java/de/tutao/tutanota/EncryptionCompatTest.kt
@@ -125,12 +125,12 @@ class CompatibilityTest {
 	}
 
 	@Test
-	fun argon2idTest() {
+	fun argon2idTest() = runBlocking {
 		for (td in testData.argon2idTests) {
 			val key = hexToBytes(td.keyHex)
 			val salt = hexToBytes(td.saltHex)
-			val password = td.password.toByteArray()
-			assertArrayEquals(key, crypto.argon2idHashRawImpl(password, salt, ARGON2ID_TIME_COST, ARGON2ID_MEMORY_COST, ARGON2ID_PARALLELISM, ARGON2ID_HASH_LENGTH))
+			val password = td.password
+			assertArrayEquals(key, crypto.argon2idGeneratePassphraseKey(password, salt.wrap()).data)
 		}
 	}
 

diff --git a/app-android/app/src/main/cpp/CMakeLists.txt b/app-android/app/src/main/cpp/CMakeLists.txt
diff --git a/app-android/app/src/main/cpp/argon2.cpp b/app-android/app/src/main/cpp/argon2.cpp
diff --git a/app-android/app/src/main/cpp/helpers/byte_array_accessor.cpp b/app-android/app/src/main/cpp/helpers/byte_array_accessor.cpp
diff --git a/app-android/app/src/main/cpp/helpers/byte_array_accessor.hpp b/app-android/app/src/main/cpp/helpers/byte_array_accessor.hpp
diff --git a/app-android/app/src/main/cpp/helpers/java_exception.hpp b/app-android/app/src/main/cpp/helpers/java_exception.hpp
diff --git a/app-android/app/src/main/cpp/helpers/non_copyable.hpp b/app-android/app/src/main/cpp/helpers/non_copyable.hpp
diff --git a/app-android/app/src/main/java/de/tutao/tutanota/AndroidNativeCryptoFacade.kt b/app-android/app/src/main/java/de/tutao/tutanota/AndroidNativeCryptoFacade.kt
@@ -151,36 +151,13 @@ class AndroidNativeCryptoFacade(
 	}
 
 	@Throws(CryptoError::class)
-	override suspend fun argon2idHashRaw(
-		password: DataWrapper,
+	override suspend fun argon2idGeneratePassphraseKey(
+		passphrase: String,
 		salt: DataWrapper,
-		timeCost: Int,
-		memoryCost: Int,
-		parallelism: Int,
-		hashLength: Int
 	): DataWrapper {
-		return DataWrapper(
-			this.argon2idHashRawImpl(
-				password.data,
-				salt.data,
-				timeCost,
-				memoryCost,
-				parallelism,
-				hashLength
-			)
-		)
+		return de.tutao.tutasdk.argon2idGenerateKeyFromPassphrase(passphrase, salt.data).wrap()
 	}
 
-	@Throws(CryptoError::class)
-	external fun argon2idHashRawImpl(
-		password: ByteArray,
-		salt: ByteArray,
-		timeCost: Int,
-		memoryCost: Int,
-		parallelism: Int,
-		hashLength: Int
-	): ByteArray
-
 	@Throws(CryptoError::class)
 	override suspend fun rsaEncrypt(
 		publicKey: RsaPublicKey,

diff --git a/app-android/calendar/build.gradle.kts b/app-android/calendar/build.gradle.kts
@@ -25,12 +25,6 @@ android {
 				this.arguments["room.schemaLocation"] = "$projectDir/schemas"
 			}
 		}
-
-		externalNativeBuild {
-			cmake {
-				this.cppFlags("")
-			}
-		}
 	}
 
 	signingConfigs {
@@ -131,13 +125,6 @@ android {
 	sourceSets {
 		this.getByName("androidTest") {
 			assets.srcDirs(files("$projectDir/schemas"))
-		};
-	}
-
-	externalNativeBuild {
-		cmake {
-			this.path(file("src/main/cpp/CMakeLists.txt"))
-			this.version = "3.18.0+"
 		}
 	}
 }

diff --git a/app-android/calendar/src/main/cpp/CMakeLists.txt b/app-android/calendar/src/main/cpp/CMakeLists.txt