matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

fix the selection of the verification methods, and test more things

Browse Source
This commit is contained in:
Hubert Chathi
2019-04-04 14:08:30 -04:00
parent 751060305c
commit 01af303d63
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/crypto/verification/SAS.js
View File

@@ -281,12 +281,18 @@ export default class SAS extends Base {
async _doRespondVerification() {
let content = this.startEvent.getContent();
// Note: we intersect using our pre-made lists, rather than the sets,
// so that the result will be in our order of preference. Then
// fetching the first element from the array will give our preferred
// method out of the ones offered by the other party.
const keyAgreement
= intersection(content.key_agreement_protocols, KEY_AGREEMENT_SET)[0];
= intersection(
KEY_AGREEMENT_LIST, new Set(content.key_agreement_protocols),
)[0];
const hashMethod
= intersection(content.hashes, HASHES_SET)[0];
= intersection(HASHES_LIST, new Set(content.hashes))[0];
const macMethod
= intersection(content.message_authentication_codes, MAC_SET)[0];
= intersection(MAC_LIST, new Set(content.message_authentication_codes))[0];
// FIXME: allow app to specify what SAS methods can be used
const sasMethods
= intersection(content.short_authentication_string, SAS_SET);