diff --git a/Gruntfile.js b/Gruntfile.js index 8e7f9b68..f4129311 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -15,14 +15,6 @@ module.exports = function(grunt) { src: components, dest: 'js/components.js', }, - test: { - src: [ - 'components/mocha/mocha.js', - 'components/chai/chai.js', - 'test/_test.js' - ], - dest: 'test/test.js', - }, curve25519: { src: [ 'build/curve25519_compiled.js', @@ -51,6 +43,14 @@ module.exports = function(grunt) { banner: ';(function(){\n', footer: '\n})();' } + }, + test: { + src: [ + 'components/mocha/mocha.js', + 'components/chai/chai.js', + 'test/_test.js' + ], + dest: 'test/test.js', } }, sass: { diff --git a/test/crypto_test.js b/test/crypto_test.js index 398a06c8..bb9149d9 100644 --- a/test/crypto_test.js +++ b/test/crypto_test.js @@ -18,6 +18,10 @@ window.assert = chai.assert; describe("Crypto", function() { + if (window.textsecure.nativeclient) { + it("supports Native Client", function() {}); + } + describe("Encrypt AES-CBC", function() { it('works', function(done) { var key = hexToArrayBuffer('603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4'); @@ -25,7 +29,7 @@ describe("Crypto", function() { var plaintext = hexToArrayBuffer('6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710'); var ciphertext = hexToArrayBuffer('f58c4c04d6e5f1ba779eabfb5f7bfbd69cfc4e967edb808d679f777bc6702c7d39f23369a9d9bacfa530e26304231461b2eb05e2c39be9fcda6c19078c6a9d1b3f461796d6b0d6b2e0c2a72b4d80e644'); window.textsecure.crypto.encrypt(key, plaintext, iv).then(function(result) { - assert.strictEqual(getString(result), getString(ciphertext)); + assertEqualArrayBuffers(result, ciphertext); }).then(done).catch(done); }); }); @@ -37,7 +41,7 @@ describe("Crypto", function() { var plaintext = hexToArrayBuffer('6bc1bee22e409f96e93d7e117393172aae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411e5fbc1191a0a52eff69f2445df4f9b17ad2b417be66c3710'); var ciphertext = hexToArrayBuffer('f58c4c04d6e5f1ba779eabfb5f7bfbd69cfc4e967edb808d679f777bc6702c7d39f23369a9d9bacfa530e26304231461b2eb05e2c39be9fcda6c19078c6a9d1b3f461796d6b0d6b2e0c2a72b4d80e644'); window.textsecure.crypto.decrypt(key, ciphertext, iv).then(function(result) { - assert.strictEqual(getString(result), getString(plaintext)); + assertEqualArrayBuffers(result, plaintext); }).then(done).catch(done); }); }); @@ -46,16 +50,19 @@ describe("Crypto", function() { it("works", function(done) { var key = hexToArrayBuffer('6f35628d65813435534b5d67fbdb54cb33403d04e843103e6399f806cb5df95febbdd61236f33245'); var input = hexToArrayBuffer('752cff52e4b90768558e5369e75d97c69643509a5e5904e0a386cbe4d0970ef73f918f675945a9aefe26daea27587e8dc909dd56fd0468805f834039b345f855cfe19c44b55af241fff3ffcd8045cd5c288e6c4e284c3720570b58e4d47b8feeedc52fd1401f698a209fccfa3b4c0d9a797b046a2759f82a54c41ccd7b5f592b'); - var mac = getString(hexToArrayBuffer('05d1243e6465ed9620c9aec1c351a186')); + var mac = hexToArrayBuffer('05d1243e6465ed9620c9aec1c351a186'); window.textsecure.crypto.sign(key, input).then(function(result) { - assert.strictEqual(getString(result).substring(0, mac.length), mac); + assertEqualArrayBuffers(result.slice(0, mac.byteLength), mac); }).then(done).catch(done); }); }); - describe("HMAC RFC5869 Test vectors", function() { + describe("HKDF", function() { it('works', function(done) { + // HMAC RFC5869 Test vectors + var T1 = hexToArrayBuffer("3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf"); + var T2 = hexToArrayBuffer("34007208d5b887185865"); var IKM = new Uint8Array(new ArrayBuffer(22)); for (var i = 0; i < 22; i++) IKM[i] = 11; @@ -69,80 +76,87 @@ describe("Crypto", function() { info[i] = 240 + i; return textsecure.crypto.HKDF(IKM.buffer, salt.buffer, info.buffer).then(function(OKM){ - var T1 = hexToArrayBuffer("3cb25f25faacd57a90434f64d0362f2a2d2d0a90cf1a5a4c5db02d56ecc4c5bf"); - var T2 = hexToArrayBuffer("34007208d5b887185865"); - assert.equal(getString(OKM[0]), getString(T1)); - assert.equal(getString(OKM[1]).substring(0, 10), getString(T2)); + assertEqualArrayBuffers(OKM[0], T1); + assertEqualArrayBuffers(OKM[1].slice(0, 10), T2); }).then(done).catch(done); }); }); - describe("Curve25519 implementation", function() { - // this is a just cute little trick to get a nice-looking note about - // which curve25519 impl we're using. - if (window.textsecure.nativeclient) { - it("is Native Client", function() {}); - } else { - it("is JavaScript", function() {}); - } - }); + var alice_bytes = hexToArrayBuffer("77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a"); + var alice_priv = hexToArrayBuffer("70076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c6a"); + var alice_pub = hexToArrayBuffer("058520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a"); + var bob_bytes = hexToArrayBuffer("5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb"); + var bob_priv = hexToArrayBuffer("58ab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e06b"); + var bob_pub = hexToArrayBuffer("05de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f"); + var shared_sec = hexToArrayBuffer("4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742"); - describe("Simple Curve25519 test vectors", function() { - it('works', function(done) { - // These are just some random curve25519 test vectors I found online (with a version byte prepended to pubkeys) - var alice_priv = hexToArrayBuffer("77076d0a7318a57d3c16c17251b26645df4c2f87ebc0992ab177fba51db92c2a"); - var alice_pub = hexToArrayBuffer("058520f0098930a754748b7ddcb43ef75a0dbf3a0d26381af4eba4a98eaa9b4e6a"); - var bob_priv = hexToArrayBuffer("5dab087e624a8a4b79e17f8b83800ee66f3bb1292618b6fd1c2f8b27ff88e0eb"); - var bob_pub = hexToArrayBuffer("05de9edb7d7b7dc1b4d35b61c2ece435373f8343c85b78674dadfc7e146f882b4f"); - var shared_sec = hexToArrayBuffer("4a5d9d5ba4ce2de1728e3bf480350f25e07e21c947d19e3376f09b3c1e161742"); - - return textsecure.crypto.createKeyPair(alice_priv).then(function(aliceKeyPair) { - var target = new Uint8Array(alice_priv.slice(0)); - target[0] &= 248; - target[31] &= 127; - target[31] |= 64; - assert.equal(getString(aliceKeyPair.pubKey), getString(alice_pub)); - assert.equal(getString(aliceKeyPair.privKey), getString(target)); - - return textsecure.crypto.createKeyPair(bob_priv).then(function(bobKeyPair) { - var target = new Uint8Array(bob_priv.slice(0)); - target[0] &= 248; - target[31] &= 127; - target[31] |= 64; - assert.equal(getString(bobKeyPair.privKey), getString(target)); - assert.equal(getString(bobKeyPair.pubKey), getString(bob_pub)); - - return textsecure.crypto.ECDHE(bobKeyPair.pubKey, aliceKeyPair.privKey).then(function(ss) { - assert.equal(getString(ss), getString(shared_sec)); - - return textsecure.crypto.ECDHE(aliceKeyPair.pubKey, bobKeyPair.privKey).then(function(ss) { - assert.equal(getString(ss), getString(shared_sec)); - }); - }); - }); - }).then(done).catch(done); + describe("createKeyPair", function() { + it ('converts alice private keys to a keypair', function(done) { + textsecure.crypto.createKeyPair(alice_bytes).then(function(keypair) { + assertEqualArrayBuffers(keypair.privKey, alice_priv); + assertEqualArrayBuffers(keypair.pubKey, alice_pub); + done(); + }).catch(done); + }); + it ('converts bob private keys to a keypair', function(done) { + textsecure.crypto.createKeyPair(bob_bytes).then(function(keypair) { + assertEqualArrayBuffers(keypair.privKey, bob_priv); + assertEqualArrayBuffers(keypair.pubKey, bob_pub); + done(); + }).catch(done); + }); + it ('generates a key if one is not provided', function(done) { + textsecure.crypto.createKeyPair().then(function(keypair) { + assert.strictEqual(keypair.privKey.byteLength, 32); + assert.strictEqual(keypair.pubKey.byteLength, 33); + assert.strictEqual(new Uint8Array(keypair.pubKey)[0], 5); + done(); + }).catch(done); }); }); - describe("Simple Ed25519 tests", function() { + describe("ECDHE", function() { + it("computes the shared secret for alice", function(done) { + textsecure.crypto.ECDHE(bob_pub, alice_priv).then(function(secret) { + assertEqualArrayBuffers(shared_sec, secret); + done(); + }).catch(done); + }); + it("computes the shared secret for bob", function(done) { + textsecure.crypto.ECDHE(alice_pub, bob_priv).then(function(secret) { + assertEqualArrayBuffers(shared_sec, secret); + done(); + }).catch(done); + }); + }); + + var priv = hexToArrayBuffer("48a8892cc4e49124b7b57d94fa15becfce071830d6449004685e387c62409973"); + var pub = hexToArrayBuffer("0555f1bfede27b6a03e0dd389478ffb01462e5c52dbbac32cf870f00af1ed9af3a"); + var msg = hexToArrayBuffer("617364666173646661736466"); + var sig = hexToArrayBuffer("2bc06c745acb8bae10fbc607ee306084d0c28e2b3bb819133392473431291fd0dfa9c7f11479996cf520730d2901267387e08d85bbf2af941590e3035a545285"); + describe("Ed25519Sign", function() { + // Some self-generated test vectors it('works', function(done) { - // Some self-generated test vectors - var priv = hexToArrayBuffer("48a8892cc4e49124b7b57d94fa15becfce071830d6449004685e387c62409973"); - var pub = hexToArrayBuffer("0555f1bfede27b6a03e0dd389478ffb01462e5c52dbbac32cf870f00af1ed9af3a"); - var msg = hexToArrayBuffer("617364666173646661736466"); - var sig = hexToArrayBuffer("2bc06c745acb8bae10fbc607ee306084d0c28e2b3bb819133392473431291fd0"+ - "dfa9c7f11479996cf520730d2901267387e08d85bbf2af941590e3035a545285"); + return textsecure.crypto.Ed25519Sign(priv, msg).then(function(sigCalc) { + assertEqualArrayBuffers(sig, sigCalc); + }).then(done).catch(done); + }); + }); - return textsecure.crypto.createKeyPair(priv).then(function(pubCalc) { - //if (getString(pub) != getString(pubCalc)) - // return false; + describe("Ed25519Verify", function() { + it("throws on bad signature", function(done) { + var badsig = sig.slice(0); + new Uint8Array(badsig).set([0], 0); - return textsecure.crypto.Ed25519Sign(priv, msg).then(function(sigCalc) { - assert.equal(getString(sig), getString(sigCalc)); + textsecure.crypto.Ed25519Verify(pub, msg, badsig).catch(function(e) { + if (e.message === 'Invalid signature') { + done(); + } else { throw e; } + }).catch(done); + }); - return textsecure.crypto.Ed25519Verify(pub, msg, sig); - }); - }).then(done).catch(done); + it("does not throw on good signature", function(done) { + return textsecure.crypto.Ed25519Verify(pub, msg, sig).then(done).catch(done); }); }); });