mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix now-broken test cases and change lots of things over to promises

Browse source
This commit is contained in:
Matt Corallo 2014-05-05 23:42:48 -04:00
parent 41d50d7480
commit 3fffbad11a
4 changed files with 140 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/webcrypto.js
View file

@ -41,28 +41,24 @@ window.crypto.subtle = (function() {
var args = Array.prototype.slice.call(arguments);
args.shift();
return new Promise(function(resolve) {
resolve(implementation.apply(this, args));
resolve(toArrayBuffer(implementation.apply(this, args)));
});
}
// public interface functions
function encrypt(algorithm, key, data) {
if (algorithm.name === "AES-CTR") {
return promise(encryptAESCTR, data, key, algorithm.counter);
}
if (algorithm.name === "AES-CTR")
return promise(encryptAESCTR, data, key, algorithm.counter);
};
function decrypt(algorithm, key, data) {
if (algorithm.name === "AES-CTR") {
return promise(decryptAESCTR, data, key, algorithm.counter);
}
if (algorithm.name === "AES-CBC") {
return promise(decryptAESCBC, data, key, algorithm.iv);
}
if (algorithm.name === "AES-CTR")
return promise(decryptAESCTR, data, key, algorithm.counter);
if (algorithm.name === "AES-CBC")
return promise(decryptAESCBC, data, key, algorithm.iv);
};
function sign(algorithm, key, data) {
if (algorithm.name === "HMAC" && algorithm.hash === "SHA-256") {
if (algorithm.name === "HMAC" && algorithm.hash === "SHA-256")
return promise(HmacSHA256, key, data);
}
};
return {