mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-25 02:45:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

More optimization

Browse source
This commit is contained in:
Benoit Marty 2020-03-05 17:11:52 +01:00
parent bda4bbb59c
commit 2a774833ec
3 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultIncomingSASDefaultVerificationTransaction.kt
View file

@ -226,12 +226,13 @@ internal class DefaultIncomingSASDefaultVerificationTransaction(
cancel(CancelCode.UnexpectedMessage) cancel(CancelCode.UnexpectedMessage)
return return
} }
theirMac = vMac theirMac = vMac
// Do I have my Mac? // Do I have my Mac?
if (myMac != null) { if (myMac != null) {
// I can check // I can check
verifyMacs() verifyMacs(vMac)
} }
// Wait for ShortCode Accepted // Wait for ShortCode Accepted
} }

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/DefaultOutgoingSASDefaultVerificationTransaction.kt
View file

@ -223,7 +223,7 @@ internal class DefaultOutgoingSASDefaultVerificationTransaction(
// Do I have my Mac? // Do I have my Mac?
if (myMac != null) { if (myMac != null) {
// I can check // I can check
verifyMacs() verifyMacs(vMac)
} }
// Wait for ShortCode Accepted // Wait for ShortCode Accepted
} }

48
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/SASDefaultVerificationTransaction.kt
View file

@ -17,6 +17,7 @@ package im.vector.matrix.android.internal.crypto.verification
import android.os.Build import android.os.Build
import im.vector.matrix.android.api.MatrixCallback import im.vector.matrix.android.api.MatrixCallback
import im.vector.matrix.android.api.extensions.orFalse
import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService import im.vector.matrix.android.api.session.crypto.crosssigning.CrossSigningService
import im.vector.matrix.android.api.session.crypto.verification.CancelCode import im.vector.matrix.android.api.session.crypto.verification.CancelCode
import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation import im.vector.matrix.android.api.session.crypto.verification.EmojiRepresentation
@ -89,15 +90,15 @@ internal abstract class SASDefaultVerificationTransaction(
private var olmSas: OlmSAS? = null private var olmSas: OlmSAS? = null
var startReq: ValidVerificationInfoStart.SasVerificationInfoStart? = null protected var startReq: ValidVerificationInfoStart.SasVerificationInfoStart? = null
var accepted: ValidVerificationInfoAccept? = null protected var accepted: ValidVerificationInfoAccept? = null
var otherKey: String? = null protected var otherKey: String? = null
var shortCodeBytes: ByteArray? = null protected var shortCodeBytes: ByteArray? = null
var myMac: ValidVerificationInfoMac? = null protected var myMac: ValidVerificationInfoMac? = null
var theirMac: ValidVerificationInfoMac? = null protected var theirMac: ValidVerificationInfoMac? = null
fun getSAS(): OlmSAS { protected fun getSAS(): OlmSAS {
if (olmSas == null) olmSas = OlmSAS() if (olmSas == null) olmSas = OlmSAS()
return olmSas!! return olmSas!!
} }
@ -187,9 +188,8 @@ internal abstract class SASDefaultVerificationTransaction(
} }
// Do I already have their Mac? // Do I already have their Mac?
if (theirMac != null) { theirMac?.let { verifyMacs(it) }
verifyMacs() // if not wait for it
} // if not wait for it
} }
override fun shortCodeDoesNotMatch() { override fun shortCodeDoesNotMatch() {
@ -209,7 +209,7 @@ internal abstract class SASDefaultVerificationTransaction(
abstract fun onKeyVerificationMac(vMac: ValidVerificationInfoMac) abstract fun onKeyVerificationMac(vMac: ValidVerificationInfoMac)
protected fun verifyMacs() { protected fun verifyMacs(theirMacSafe: ValidVerificationInfoMac) {
Timber.v("## SAS verifying macs for id:$transactionId") Timber.v("## SAS verifying macs for id:$transactionId")
state = VerificationTxState.Verifying state = VerificationTxState.Verifying
@ -220,16 +220,12 @@ internal abstract class SASDefaultVerificationTransaction(
// as well as the HMAC of the comma-separated, sorted list of the key IDs given in the message. // as well as the HMAC of the comma-separated, sorted list of the key IDs given in the message.
// Bob’s device compares these with the HMAC values given in the m.key.verification.mac message. // Bob’s device compares these with the HMAC values given in the m.key.verification.mac message.
// If everything matches, then consider Alice’s device keys as verified. // If everything matches, then consider Alice’s device keys as verified.
val baseInfo = "MATRIX_KEY_VERIFICATION_MAC$otherUserId$otherDeviceId$userId$deviceId$transactionId"
val baseInfo = "MATRIX_KEY_VERIFICATION_MAC" + val commaSeparatedListOfKeyIds = theirMacSafe.mac.keys.sorted().joinToString(",")
otherUserId + otherDeviceId +
userId + deviceId +
transactionId
val commaSeparatedListOfKeyIds = theirMac!!.mac.keys.sorted().joinToString(",")
val keyStrings = macUsingAgreedMethod(commaSeparatedListOfKeyIds, baseInfo + "KEY_IDS") val keyStrings = macUsingAgreedMethod(commaSeparatedListOfKeyIds, baseInfo + "KEY_IDS")
if (theirMac!!.keys != keyStrings) { if (theirMacSafe.keys != keyStrings) {
// WRONG! // WRONG!
cancel(CancelCode.MismatchedKeys) cancel(CancelCode.MismatchedKeys)
return return
@ -238,7 +234,7 @@ internal abstract class SASDefaultVerificationTransaction(
val verifiedDevices = ArrayList<String>() val verifiedDevices = ArrayList<String>()
// cannot be empty because it has been validated // cannot be empty because it has been validated
theirMac!!.mac.keys.forEach { theirMacSafe.mac.keys.forEach {
val keyIDNoPrefix = it.withoutPrefix("ed25519:") val keyIDNoPrefix = it.withoutPrefix("ed25519:")
val otherDeviceKey = otherUserKnownDevices?.get(keyIDNoPrefix)?.fingerprint() val otherDeviceKey = otherUserKnownDevices?.get(keyIDNoPrefix)?.fingerprint()
if (otherDeviceKey == null) { if (otherDeviceKey == null) {
@ -247,7 +243,7 @@ internal abstract class SASDefaultVerificationTransaction(
return@forEach return@forEach
} }
val mac = macUsingAgreedMethod(otherDeviceKey, baseInfo + it) val mac = macUsingAgreedMethod(otherDeviceKey, baseInfo + it)
if (mac != theirMac?.mac?.get(it)) { if (mac != theirMacSafe.mac[it]) {
// WRONG! // WRONG!
Timber.e("## SAS Verification: mac mismatch for $otherDeviceKey with id $keyIDNoPrefix") Timber.e("## SAS Verification: mac mismatch for $otherDeviceKey with id $keyIDNoPrefix")
cancel(CancelCode.MismatchedKeys) cancel(CancelCode.MismatchedKeys)
@ -261,12 +257,12 @@ internal abstract class SASDefaultVerificationTransaction(
val otherCrossSigningMasterKeyPublic = otherMasterKey?.unpaddedBase64PublicKey val otherCrossSigningMasterKeyPublic = otherMasterKey?.unpaddedBase64PublicKey
if (otherCrossSigningMasterKeyPublic != null) { if (otherCrossSigningMasterKeyPublic != null) {
// Did the user signed his master key // Did the user signed his master key
theirMac!!.mac.keys.forEach { theirMacSafe.mac.keys.forEach {
val keyIDNoPrefix = it.withoutPrefix("ed25519:") val keyIDNoPrefix = it.withoutPrefix("ed25519:")
if (keyIDNoPrefix == otherCrossSigningMasterKeyPublic) { if (keyIDNoPrefix == otherCrossSigningMasterKeyPublic) {
// Check the signature // Check the signature
val mac = macUsingAgreedMethod(otherCrossSigningMasterKeyPublic, baseInfo + it) val mac = macUsingAgreedMethod(otherCrossSigningMasterKeyPublic, baseInfo + it)
if (mac != theirMac?.mac?.get(it)) { if (mac != theirMacSafe.mac.get(it)) {
// WRONG! // WRONG!
Timber.e("## SAS Verification: mac mismatch for MasterKey with id $keyIDNoPrefix") Timber.e("## SAS Verification: mac mismatch for MasterKey with id $keyIDNoPrefix")
cancel(CancelCode.MismatchedKeys) cancel(CancelCode.MismatchedKeys)
@ -364,11 +360,11 @@ internal abstract class SASDefaultVerificationTransaction(
} }
override fun supportsEmoji(): Boolean { override fun supportsEmoji(): Boolean {
return accepted?.shortAuthenticationStrings?.contains(SasMode.EMOJI) == true return accepted?.shortAuthenticationStrings?.contains(SasMode.EMOJI).orFalse()
} }
override fun supportsDecimal(): Boolean { override fun supportsDecimal(): Boolean {
return accepted?.shortAuthenticationStrings?.contains(SasMode.DECIMAL) == true return accepted?.shortAuthenticationStrings?.contains(SasMode.DECIMAL).orFalse()
} }
protected fun hashUsingAgreedHashMethod(toHash: String): String? { protected fun hashUsingAgreedHashMethod(toHash: String): String? {
@ -381,7 +377,7 @@ internal abstract class SASDefaultVerificationTransaction(
return null return null
} }
protected fun macUsingAgreedMethod(message: String, info: String): String? { private fun macUsingAgreedMethod(message: String, info: String): String? {
if (SAS_MAC_SHA256_LONGKDF.toLowerCase() == accepted?.messageAuthenticationCode?.toLowerCase()) { if (SAS_MAC_SHA256_LONGKDF.toLowerCase() == accepted?.messageAuthenticationCode?.toLowerCase()) {
return getSAS().calculateMacLongKdf(message, info) return getSAS().calculateMacLongKdf(message, info)
} else if (SAS_MAC_SHA256.toLowerCase() == accepted?.messageAuthenticationCode?.toLowerCase()) { } else if (SAS_MAC_SHA256.toLowerCase() == accepted?.messageAuthenticationCode?.toLowerCase()) {
@ -431,7 +427,7 @@ internal abstract class SASDefaultVerificationTransaction(
* For each group of 6 bits, look up the emoji from Appendix A corresponding * For each group of 6 bits, look up the emoji from Appendix A corresponding
* to that number 7 emoji are selected from a list of 64 emoji (see Appendix A) * to that number 7 emoji are selected from a list of 64 emoji (see Appendix A)
*/ */
fun getEmojiCodeRepresentation(byteArray: ByteArray): List<EmojiRepresentation> { private fun getEmojiCodeRepresentation(byteArray: ByteArray): List<EmojiRepresentation> {
val b0 = byteArray[0].toUnsignedInt() val b0 = byteArray[0].toUnsignedInt()
val b1 = byteArray[1].toUnsignedInt() val b1 = byteArray[1].toUnsignedInt()
val b2 = byteArray[2].toUnsignedInt() val b2 = byteArray[2].toUnsignedInt()