Give up on webcrypto :(

This commit is contained in:
Matt Corallo 2014-10-26 02:46:13 -07:00
parent 21225b2074
commit 68a42a6ae7

View file

@ -1,5 +1,4 @@
/* vim: ts=4:sw=4:expandtab /*
*
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by * it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
@ -14,99 +13,94 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* Web Crypto polyfill. TODO: replace with web crypto */
// All inputs/outputs are arraybuffers! // All inputs/outputs are arraybuffers!
window.textsecure.subtle = (function() { window.textsecure.subtle = (function() {
/* if (window.crypto.subtle !== undefined && window.crypto.subtle !== null) { var StaticArrayBufferProto = new ArrayBuffer().__proto__;
return window.crypto.subtle; function assertIsArrayBuffer(thing) {
} else*/ { if (thing !== Object(thing) || thing.__proto__ != StaticArrayBufferProto)
var StaticArrayBufferProto = new ArrayBuffer().__proto__; throw new Error("Needed a ArrayBuffer");
function assertIsArrayBuffer(thing) { }
if (thing !== Object(thing) || thing.__proto__ != StaticArrayBufferProto)
throw new Error("Needed a ArrayBuffer");
}
// private implementation functions // private implementation functions
function HmacSHA256(key, input) { function HmacSHA256(key, input) {
assertIsArrayBuffer(key); assertIsArrayBuffer(key);
assertIsArrayBuffer(input); assertIsArrayBuffer(input);
return CryptoJS.HmacSHA256( return CryptoJS.HmacSHA256(
CryptoJS.lib.WordArray.create(toArrayBuffer(input)), CryptoJS.lib.WordArray.create(input),
CryptoJS.enc.Latin1.parse(getString(key)) CryptoJS.enc.Latin1.parse(getString(key))
).toString(CryptoJS.enc.Latin1); ).toString(CryptoJS.enc.Latin1);
}; };
function encryptAESCTR(plaintext, key, counter) { function encryptAESCTR(plaintext, key, counter) {
assertIsArrayBuffer(plaintext); assertIsArrayBuffer(plaintext);
assertIsArrayBuffer(key); assertIsArrayBuffer(key);
assertIsArrayBuffer(counter); assertIsArrayBuffer(counter);
return CryptoJS.AES.encrypt(CryptoJS.enc.Latin1.parse(getString(plaintext)), return CryptoJS.AES.encrypt(CryptoJS.enc.Latin1.parse(getString(plaintext)),
CryptoJS.enc.Latin1.parse(getString(key)), CryptoJS.enc.Latin1.parse(getString(key)),
{mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)), {mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)),
padding: CryptoJS.pad.NoPadding}) padding: CryptoJS.pad.NoPadding})
.ciphertext.toString(CryptoJS.enc.Latin1); .ciphertext.toString(CryptoJS.enc.Latin1);
}; };
function decryptAESCTR(ciphertext, key, counter) { function decryptAESCTR(ciphertext, key, counter) {
assertIsArrayBuffer(ciphertext); assertIsArrayBuffer(ciphertext);
assertIsArrayBuffer(key); assertIsArrayBuffer(key);
assertIsArrayBuffer(counter); assertIsArrayBuffer(counter);
return CryptoJS.AES.decrypt(btoa(getString(ciphertext)), return CryptoJS.AES.decrypt(btoa(getString(ciphertext)),
CryptoJS.enc.Latin1.parse(getString(key)), CryptoJS.enc.Latin1.parse(getString(key)),
{mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)), {mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)),
padding: CryptoJS.pad.NoPadding}) padding: CryptoJS.pad.NoPadding})
.toString(CryptoJS.enc.Latin1); .toString(CryptoJS.enc.Latin1);
}; };
function encryptAESCBC(plaintext, key, iv) { function encryptAESCBC(plaintext, key, iv) {
assertIsArrayBuffer(plaintext); assertIsArrayBuffer(plaintext);
assertIsArrayBuffer(key); assertIsArrayBuffer(key);
assertIsArrayBuffer(iv); assertIsArrayBuffer(iv);
return CryptoJS.AES.encrypt(CryptoJS.enc.Latin1.parse(getString(plaintext)), return CryptoJS.AES.encrypt(CryptoJS.enc.Latin1.parse(getString(plaintext)),
CryptoJS.enc.Latin1.parse(getString(key)), CryptoJS.enc.Latin1.parse(getString(key)),
{iv: CryptoJS.enc.Latin1.parse(getString(iv))}) {iv: CryptoJS.enc.Latin1.parse(getString(iv))})
.ciphertext.toString(CryptoJS.enc.Latin1); .ciphertext.toString(CryptoJS.enc.Latin1);
}; };
function decryptAESCBC(ciphertext, key, iv) { function decryptAESCBC(ciphertext, key, iv) {
assertIsArrayBuffer(ciphertext); assertIsArrayBuffer(ciphertext);
assertIsArrayBuffer(key); assertIsArrayBuffer(key);
assertIsArrayBuffer(iv); assertIsArrayBuffer(iv);
return CryptoJS.AES.decrypt(btoa(getString(ciphertext)), return CryptoJS.AES.decrypt(btoa(getString(ciphertext)),
CryptoJS.enc.Latin1.parse(getString(key)), CryptoJS.enc.Latin1.parse(getString(key)),
{iv: CryptoJS.enc.Latin1.parse(getString(iv))}) {iv: CryptoJS.enc.Latin1.parse(getString(iv))})
.toString(CryptoJS.enc.Latin1); .toString(CryptoJS.enc.Latin1);
}; };
// utility function for connecting front and back ends via promises // utility function for connecting front and back ends via promises
// Takes an implementation function and 0 or more arguments // Takes an implementation function and 0 or more arguments
function promise(implementation) { function promise(implementation) {
var args = Array.prototype.slice.call(arguments); var args = Array.prototype.slice.call(arguments);
args.shift(); args.shift();
return Promise.resolve(toArrayBuffer(implementation.apply(this, args))); return Promise.resolve(toArrayBuffer(implementation.apply(this, args)));
} }
// public interface functions // public interface functions
function encrypt(algorithm, key, data) { function encrypt(algorithm, key, data) {
if (algorithm.name === "AES-CTR") if (algorithm.name === "AES-CTR")
return promise(encryptAESCTR, data, key, algorithm.counter); return promise(encryptAESCTR, data, key, algorithm.counter);
if (algorithm.name === "AES-CBC") if (algorithm.name === "AES-CBC")
return promise(encryptAESCBC, data, key, algorithm.iv); return promise(encryptAESCBC, data, key, algorithm.iv);
}; };
function decrypt(algorithm, key, data) { function decrypt(algorithm, key, data) {
if (algorithm.name === "AES-CTR") if (algorithm.name === "AES-CTR")
return promise(decryptAESCTR, data, key, algorithm.counter); return promise(decryptAESCTR, data, key, algorithm.counter);
if (algorithm.name === "AES-CBC") if (algorithm.name === "AES-CBC")
return promise(decryptAESCBC, data, key, algorithm.iv); return promise(decryptAESCBC, data, key, algorithm.iv);
}; };
function sign(algorithm, key, data) { 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 promise(HmacSHA256, key, data);
}; };
return { return {
encrypt : encrypt, encrypt : encrypt,
decrypt : decrypt, decrypt : decrypt,
sign : sign, sign : sign,
} }
}
})(); })();