From a4b25f7df18208dc1e18b129ba05923b5ad4f050 Mon Sep 17 00:00:00 2001 From: lilia Date: Thu, 23 Oct 2014 20:45:09 -0700 Subject: [PATCH] Disable the real webcrypto Sadly, we are not quite compliant with the WC3 webcrypto spec due to our insistance on passing around key data in plain old ArrayBuffers. Also converted whitespace. --- js/webcrypto.js | 150 ++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/js/webcrypto.js b/js/webcrypto.js index 2092f47f1..cf10a0c77 100644 --- a/js/webcrypto.js +++ b/js/webcrypto.js @@ -1,4 +1,4 @@ -/* vim: ts=4:sw=4 +/* vim: ts=4:sw=4:expandtab * * 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 @@ -17,85 +17,85 @@ /* Web Crypto polyfill. TODO: replace with web crypto */ // All inputs/outputs are arraybuffers! window.crypto.subtle = (function() { - if (window.crypto.subtle !== undefined && window.crypto.subtle !== null) { - return window.crypto.subtle; - } else { - var StaticArrayBufferProto = new ArrayBuffer().__proto__; - function assertIsArrayBuffer(thing) { - if (thing !== Object(thing) || thing.__proto__ != StaticArrayBufferProto) - throw new Error("Needed a ArrayBuffer"); - } +/* if (window.crypto.subtle !== undefined && window.crypto.subtle !== null) { + return window.crypto.subtle; + } else*/ { + var StaticArrayBufferProto = new ArrayBuffer().__proto__; + function assertIsArrayBuffer(thing) { + if (thing !== Object(thing) || thing.__proto__ != StaticArrayBufferProto) + throw new Error("Needed a ArrayBuffer"); + } - // private implementation functions - function HmacSHA256(key, input) { - assertIsArrayBuffer(key); - assertIsArrayBuffer(input); - return CryptoJS.HmacSHA256( - CryptoJS.lib.WordArray.create(toArrayBuffer(input)), - CryptoJS.enc.Latin1.parse(getString(key)) - ).toString(CryptoJS.enc.Latin1); - }; + // private implementation functions + function HmacSHA256(key, input) { + assertIsArrayBuffer(key); + assertIsArrayBuffer(input); + return CryptoJS.HmacSHA256( + CryptoJS.lib.WordArray.create(toArrayBuffer(input)), + CryptoJS.enc.Latin1.parse(getString(key)) + ).toString(CryptoJS.enc.Latin1); + }; - function encryptAESCTR(plaintext, key, counter) { - assertIsArrayBuffer(plaintext); - assertIsArrayBuffer(key); - assertIsArrayBuffer(counter); - return CryptoJS.AES.encrypt(CryptoJS.enc.Latin1.parse(getString(plaintext)), - CryptoJS.enc.Latin1.parse(getString(key)), - {mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)), - padding: CryptoJS.pad.NoPadding}) - .ciphertext.toString(CryptoJS.enc.Latin1); - }; + function encryptAESCTR(plaintext, key, counter) { + assertIsArrayBuffer(plaintext); + assertIsArrayBuffer(key); + assertIsArrayBuffer(counter); + return CryptoJS.AES.encrypt(CryptoJS.enc.Latin1.parse(getString(plaintext)), + CryptoJS.enc.Latin1.parse(getString(key)), + {mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)), + padding: CryptoJS.pad.NoPadding}) + .ciphertext.toString(CryptoJS.enc.Latin1); + }; - function decryptAESCTR(ciphertext, key, counter) { - assertIsArrayBuffer(ciphertext); - assertIsArrayBuffer(key); - assertIsArrayBuffer(counter); - return CryptoJS.AES.decrypt(btoa(getString(ciphertext)), - CryptoJS.enc.Latin1.parse(getString(key)), - {mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)), - padding: CryptoJS.pad.NoPadding}) - .toString(CryptoJS.enc.Latin1); - }; + function decryptAESCTR(ciphertext, key, counter) { + assertIsArrayBuffer(ciphertext); + assertIsArrayBuffer(key); + assertIsArrayBuffer(counter); + return CryptoJS.AES.decrypt(btoa(getString(ciphertext)), + CryptoJS.enc.Latin1.parse(getString(key)), + {mode: CryptoJS.mode.CTR, iv: CryptoJS.enc.Latin1.parse(getString(counter)), + padding: CryptoJS.pad.NoPadding}) + .toString(CryptoJS.enc.Latin1); + }; - function decryptAESCBC(ciphertext, key, iv) { - assertIsArrayBuffer(ciphertext); - assertIsArrayBuffer(key); - assertIsArrayBuffer(iv); - return CryptoJS.AES.decrypt(btoa(getString(ciphertext)), - CryptoJS.enc.Latin1.parse(getString(key)), - {iv: CryptoJS.enc.Latin1.parse(getString(iv))}) - .toString(CryptoJS.enc.Latin1); - }; + function decryptAESCBC(ciphertext, key, iv) { + assertIsArrayBuffer(ciphertext); + assertIsArrayBuffer(key); + assertIsArrayBuffer(iv); + return CryptoJS.AES.decrypt(btoa(getString(ciphertext)), + CryptoJS.enc.Latin1.parse(getString(key)), + {iv: CryptoJS.enc.Latin1.parse(getString(iv))}) + .toString(CryptoJS.enc.Latin1); + }; - // utility function for connecting front and back ends via promises - // Takes an implementation function and 0 or more arguments - function promise(implementation) { - var args = Array.prototype.slice.call(arguments); - args.shift(); - return Promise.resolve(toArrayBuffer(implementation.apply(this, args))); - } + // utility function for connecting front and back ends via promises + // Takes an implementation function and 0 or more arguments + function promise(implementation) { + var args = Array.prototype.slice.call(arguments); + args.shift(); + return Promise.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); - }; - 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); - }; - function sign(algorithm, key, data) { - if (algorithm.name === "HMAC" && algorithm.hash === "SHA-256") - return promise(HmacSHA256, key, data); - }; + // public interface functions + function encrypt(algorithm, key, data) { + 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); + }; + function sign(algorithm, key, data) { + if (algorithm.name === "HMAC" && algorithm.hash === "SHA-256") + return promise(HmacSHA256, key, data); + }; - return { - encrypt : encrypt, - decrypt : decrypt, - sign : sign, - } - } + return { + encrypt : encrypt, + decrypt : decrypt, + sign : sign, + } + } })();