OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4185 from matrix-org/jryans/sharing-names 

Fix secret sharing names to match spec
pull/21833/head
J. Ryan Stinnett 2020-03-09 13:48:11 +00:00 committed by GitHub
parent 49fe1887df 47b1552ccc
commit 769f1f4e00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CrossSigningManager.js
View File

@ -144,10 +144,10 @@ const onSecretRequested = async function({
} }
const callbacks = client.getCrossSigningCacheCallbacks(); const callbacks = client.getCrossSigningCacheCallbacks();
if (!callbacks.getCrossSigningKeyCache) return; if (!callbacks.getCrossSigningKeyCache) return;
if (name === "m.key.self_signing") { if (name === "m.cross_signing.self_signing") {
const key = await callbacks.getCrossSigningKeyCache("self_signing"); const key = await callbacks.getCrossSigningKeyCache("self_signing");
return key && encodeBase64(key); return key && encodeBase64(key);
} else if (name === "m.key.user_signing") { } else if (name === "m.cross_signing.user_signing") {
const key = await callbacks.getCrossSigningKeyCache("user_signing"); const key = await callbacks.getCrossSigningKeyCache("user_signing");
return key && encodeBase64(key); return key && encodeBase64(key);
} }