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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory 2017-05-22 12:30:08 +02:00
commit 408a4dad94
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/file/main.js
View File

@ -258,6 +258,8 @@ define([
var src = Cryptpad.getBlobPathFromHex(hexFileName); var src = Cryptpad.getBlobPathFromHex(hexFileName);
return Cryptpad.fetch(src, function (e, u8) { return Cryptpad.fetch(src, function (e, u8) {
if (e) { return void Cryptpad.alert(e); } if (e) { return void Cryptpad.alert(e); }
// now decrypt the u8 // now decrypt the u8
var cryptKey = secret.keys && secret.keys.fileKeyStr; var cryptKey = secret.keys && secret.keys.fileKeyStr;
var key = Nacl.util.decodeBase64(cryptKey); var key = Nacl.util.decodeBase64(cryptKey);
@ -266,6 +268,7 @@ define([
return void Cryptpad.errorLoadingScreen(e); return void Cryptpad.errorLoadingScreen(e);
} }
return console.error(FileCrypto.decryptMetadata(u8, key));
FileCrypto.decrypt(u8, key, function (e, data) { FileCrypto.decrypt(u8, key, function (e, data) {
if (e) { if (e) {
return console.error(e); return console.error(e);