encrypt/up1
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

null terminate header

Browse source
This commit is contained in:
Andre D 2015-06-05 23:05:09 -04:00
parent 56fe88a616
commit 4f4a022d9e
2 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
static/js/encryption.js
View file

@ -46,20 +46,17 @@ function decrypt(file, seed, id) {
var after = sjcl.mode.ccm.decrypt(prp, before, params.iv);
var afterarray = new Uint8Array(sjcl.codec.bytes.fromBits(after));
var headerlengthbuffer = new Uint8Array(Array.prototype.slice.call(afterarray, 0, 2)).buffer
var headerlength = new DataView(headerlengthbuffer).getUint16(0)
console.log(headerlength)
var headerbuffer = new Uint8Array(Array.prototype.slice.call(afterarray, 2, (headerlength + 1) * 2)).buffer
var header = ''
var headerview = new DataView(headerbuffer)
var headerview = new DataView(afterarray.buffer)
for (var i = 0; i < headerlength; i++) {
header += String.fromCharCode(headerview.getUint16(i * 2, false));
var i = 0;
for (; ; i++) {
var num = headerview.getUint16(i * 2, false)
if (num == 0) {
break;
}
header += String.fromCharCode(num);
}
console.log(header)
@ -71,7 +68,7 @@ function decrypt(file, seed, id) {
postMessage({
'id': id,
'header': header,
'decrypted': data.slice((headerlength + 1) * 2, data.size, header.mime)
'decrypted': data.slice((i * 2) + 2, data.size, header.mime)
})
}

6
static/js/loadencryption.js
View file

@ -50,11 +50,9 @@ $(function () {
'name': file.name ? file.name : ('Pasted ' + (file.type.startsWith('text/') ? 'text' : 'file'))
})
var length = new ArrayBuffer(2);
var zero = new Uint8Array([0, 0]);
var dv = new DataView(length).setUint16(0, header.length, false)
var blob = new Blob([length, str2ab(header), file])
var blob = new Blob([str2ab(header), zero, file])
var promise = getpromise()