web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove XXX

Browse Source
This commit is contained in:
yflory
2018-06-11 15:40:36 +02:00
parent aeaf7d1950
commit da396b6528
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/sframe-common.js
View File

@@ -112,11 +112,9 @@ define([
var origin = ctx.metadataMgr.getPrivateData().origin; var origin = ctx.metadataMgr.getPrivateData().origin;
return '<script src="' + origin + '/common/media-tag-nacl.min.js"></script>'; return '<script src="' + origin + '/common/media-tag-nacl.min.js"></script>';
}; };
funcs.getMediatagFromHref = function (href) { funcs.getMediatagFromHref = function () {
// XXX: Should only be used with the current href
var data = ctx.metadataMgr.getPrivateData(); var data = ctx.metadataMgr.getPrivateData();
var parsed = Hash.parsePadUrl(href); var secret = Hash.getSecrets('file', data.availableHashes.fileHash, data.password);
var secret = Hash.getSecrets('file', parsed.hash, data.password);
if (secret.keys && secret.channel) { if (secret.keys && secret.channel) {
var key = Hash.encodeBase64(secret.keys && secret.keys.cryptKey); var key = Hash.encodeBase64(secret.keys && secret.keys.cryptKey);
var hexFileName = secret.channel; var hexFileName = secret.channel;