Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove dependency on libolm #8901

Merged
merged 13 commits into from
Sep 23, 2024
Merged

Remove dependency on libolm #8901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5908cd5
Remove dependency on libolm - WIP
bmarty Aug 26, 2024
15c86f3
Better cleanup of the Crypto database.
bmarty Aug 27, 2024
637a227
Remove old unused algorithm `m.secret_storage.v1.curve25519-aes-sha2`
bmarty Sep 10, 2024
fc68f1c
Remove todo and cleanup
bmarty Sep 10, 2024
355621b
Encrypt data for the content scanner using PkEncryption from the Rust…
bmarty Sep 11, 2024
8056285
New SDK: fix API break.
bmarty Sep 11, 2024
14a52d4
ScanEncryptorUtils.getDownloadBodyAndEncryptIfNeeded can throw, ensur…
bmarty Sep 12, 2024
9dcb7c8
Use local val and more compact code.
bmarty Sep 12, 2024
51c20b4
Fix quality issues.
bmarty Sep 12, 2024
f726d16
Fix wrong sha256 conversion and add unit test.
bmarty Sep 16, 2024
9efb692
Bump org.matrix.rustcomponents:crypto-android from 0.4.1 to 0.4.3
dependabot[bot] Sep 18, 2024
f7195a8
Fix copyright issue.
bmarty Sep 20, 2024
e89bec4
use pkEncryption, to properly close it.
bmarty Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions matrix-sdk-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,6 @@ dependencies {
// Work
implementation libs.androidx.work

// olm lib is now hosted in MavenCentral
implementation 'org.matrix.android:olm-sdk:3.2.12'

// DI
implementation libs.dagger.dagger
kapt libs.dagger.daggerCompiler
Expand All @@ -224,7 +221,7 @@ dependencies {

implementation libs.google.phonenumber

implementation("org.matrix.rustcomponents:crypto-android:0.4.1")
implementation("org.matrix.rustcomponents:crypto-android:0.4.3")
// api project(":library:rustCrypto")

testImplementation libs.tests.junit
Expand All @@ -236,6 +233,7 @@ dependencies {
testImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1'
// Transitively required for mocking realm as monarchy doesn't expose Rx
testImplementation libs.rx.rxKotlin
testImplementation libs.tests.robolectric

kaptAndroidTest libs.dagger.daggerCompiler
androidTestImplementation libs.androidx.testCore
Expand Down
3 changes: 0 additions & 3 deletions matrix-sdk-android/src/androidTest/assets/crypto_store_20.realm
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions matrix-sdk-android/src/androidTest/assets/crypto_store_migration_16.realm
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import org.matrix.android.sdk.internal.network.ApiInterceptor
import org.matrix.android.sdk.internal.network.UserAgentHolder
import org.matrix.android.sdk.internal.util.BackgroundDetectionObserver
import org.matrix.android.sdk.internal.worker.MatrixWorkerFactory
import org.matrix.olm.OlmManager
import java.util.concurrent.Executors
import javax.inject.Inject

Expand All @@ -49,7 +48,6 @@ internal class TestMatrix(context: Context, matrixConfiguration: MatrixConfigura
@Inject internal lateinit var rawService: RawService
@Inject internal lateinit var userAgentHolder: UserAgentHolder
@Inject internal lateinit var backgroundDetectionObserver: BackgroundDetectionObserver
@Inject internal lateinit var olmManager: OlmManager
@Inject internal lateinit var sessionManager: SessionManager
@Inject internal lateinit var homeServerHistoryService: HomeServerHistoryService
@Inject internal lateinit var apiInterceptor: ApiInterceptor
Expand Down
28 changes: 11 additions & 17 deletions ...roidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupPasswordTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
import org.junit.Assert.assertArrayEquals
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.FixMethodOrder
import org.junit.Ignore
import org.junit.Test
Expand All @@ -29,19 +28,12 @@ import org.junit.runners.MethodSorters
import org.matrix.android.sdk.InstrumentedTest
import org.matrix.android.sdk.api.listeners.ProgressListener
import org.matrix.android.sdk.common.assertByteArrayNotEqual
import org.matrix.olm.OlmManager
import org.matrix.olm.OlmPkDecryption

@Ignore("Ignored in order to speed up test run time")
@RunWith(AndroidJUnit4::class)
@FixMethodOrder(MethodSorters.JVM)
class KeysBackupPasswordTest : InstrumentedTest {

@Before
fun ensureLibLoaded() {
OlmManager()
}

/**
* Check KeysBackupPassword utilities
*/
Expand All @@ -51,7 +43,7 @@ class KeysBackupPasswordTest : InstrumentedTest {

assertEquals(32, generatePrivateKeyResult.salt.length)
assertEquals(500_000, generatePrivateKeyResult.iterations)
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, generatePrivateKeyResult.privateKey.size)

// Reverse operation
val retrievedPrivateKey = retrievePrivateKeyWithPassword(
Expand All @@ -60,7 +52,7 @@ class KeysBackupPasswordTest : InstrumentedTest {
generatePrivateKeyResult.iterations
)

assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, retrievedPrivateKey.size)
assertArrayEquals(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
}

Expand Down Expand Up @@ -101,7 +93,7 @@ class KeysBackupPasswordTest : InstrumentedTest {

assertEquals(32, generatePrivateKeyResult.salt.length)
assertEquals(500_000, generatePrivateKeyResult.iterations)
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, generatePrivateKeyResult.privateKey.size)

// Reverse operation, with bad password
val retrievedPrivateKey = retrievePrivateKeyWithPassword(
Expand All @@ -110,7 +102,7 @@ class KeysBackupPasswordTest : InstrumentedTest {
generatePrivateKeyResult.iterations
)

assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, retrievedPrivateKey.size)
assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
}

Expand All @@ -123,7 +115,7 @@ class KeysBackupPasswordTest : InstrumentedTest {

assertEquals(32, generatePrivateKeyResult.salt.length)
assertEquals(500_000, generatePrivateKeyResult.iterations)
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, generatePrivateKeyResult.privateKey.size)

// Reverse operation, with bad iteration
val retrievedPrivateKey = retrievePrivateKeyWithPassword(
Expand All @@ -132,7 +124,7 @@ class KeysBackupPasswordTest : InstrumentedTest {
500_001
)

assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, retrievedPrivateKey.size)
assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
}

Expand All @@ -145,7 +137,7 @@ class KeysBackupPasswordTest : InstrumentedTest {

assertEquals(32, generatePrivateKeyResult.salt.length)
assertEquals(500_000, generatePrivateKeyResult.iterations)
assertEquals(OlmPkDecryption.privateKeyLength(), generatePrivateKeyResult.privateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, generatePrivateKeyResult.privateKey.size)

// Reverse operation, with bad iteration
val retrievedPrivateKey = retrievePrivateKeyWithPassword(
Expand All @@ -154,7 +146,7 @@ class KeysBackupPasswordTest : InstrumentedTest {
generatePrivateKeyResult.iterations
)

assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, retrievedPrivateKey.size)
assertByteArrayNotEqual(generatePrivateKeyResult.privateKey, retrievedPrivateKey)
}

Expand All @@ -169,7 +161,7 @@ class KeysBackupPasswordTest : InstrumentedTest {

val retrievedPrivateKey = retrievePrivateKeyWithPassword(password, salt, iteration)

assertEquals(OlmPkDecryption.privateKeyLength(), retrievedPrivateKey.size)
assertEquals(EXPECTED_PRIVATE_KEY_LENGTH, retrievedPrivateKey.size)

// Data from RiotWeb
val privateKeyBytes = byteArrayOf(
Expand All @@ -187,5 +179,7 @@ class KeysBackupPasswordTest : InstrumentedTest {
private const val BAD_PASSWORD = "passw0rd"

private const val BAD_SALT = "AA0lxhQ9aYgGfMsclVWPIAublg8h9Nlu"

private const val EXPECTED_PRIVATE_KEY_LENGTH = 32
}
}
147 changes: 0 additions & 147 deletions ...droid/sdk/internal/crypto/store/migration/DynamicElementAndroidToElementRMigrationTest.kt
View file
Open in desktop

This file was deleted.

Loading
Loading