diff -r 000000000000 -r 6474c204b198 services/crypto/tests/unit/test_crypto_crypt.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/services/crypto/tests/unit/test_crypto_crypt.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,265 @@
+Cu.import("resource://services-crypto/WeaveCrypto.js");
+
+let cryptoSvc = new WeaveCrypto();
+
+function run_test() {
+  
+  if ("makeSECItem" in cryptoSvc)   // Only for js-ctypes WeaveCrypto.
+    test_makeSECItem();
+  
+  if (this.gczeal) {
+    _("Running crypto tests with gczeal(2).");
+    gczeal(2);
+  }
+  test_bug_617650();
+  test_encrypt_decrypt();
+  test_SECItem_byteCompressInts();
+  test_key_memoization();
+  if (this.gczeal)
+    gczeal(0);
+}
+
+function test_key_memoization() {
+  let oldImport = cryptoSvc.nss && cryptoSvc.nss.PK11_ImportSymKey;
+  if (!oldImport) {
+    _("Couldn't swizzle PK11_ImportSymKey; returning.");
+    return;
+  }
+
+  let iv  = cryptoSvc.generateRandomIV();
+  let key = cryptoSvc.generateRandomKey();
+  let c   = 0;
+  cryptoSvc.nss.PK11_ImportSymKey = function(slot, type, origin, operation, key, wincx) {
+    c++;
+    return oldImport(slot, type, origin, operation, key, wincx);
+  }
+
+  // Encryption should cause a single counter increment.
+  do_check_eq(c, 0);
+  let cipherText = cryptoSvc.encrypt("Hello, world.", key, iv);
+  do_check_eq(c, 1);
+  let cipherText = cryptoSvc.encrypt("Hello, world.", key, iv);
+  do_check_eq(c, 1);
+
+  // ... as should decryption.
+  cryptoSvc.decrypt(cipherText, key, iv);
+  cryptoSvc.decrypt(cipherText, key, iv);
+  cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(c, 2);
+
+  // Un-swizzle.
+  cryptoSvc.nss.PK11_ImportSymKey = oldImport;
+}
+
+function multiple_decrypts(iterations) {
+  let iv = cryptoSvc.generateRandomIV();
+  let key = cryptoSvc.generateRandomKey();
+  let cipherText = cryptoSvc.encrypt("Hello, world.", key, iv);
+
+  for (let i = 0; i < iterations; ++i) {
+    let clearText = cryptoSvc.decrypt(cipherText, key, iv);
+    do_check_eq(clearText + " " + i, "Hello, world. " + i);
+  }
+  _("Done with multiple_decrypts.");
+}
+
+function test_bug_617650() {
+  if (this.gczeal) {
+    gczeal(2);
+    // Few iterations, because gczeal(2) is expensive... and makes it fail much faster!
+    _("gczeal set to 2; attempting 10 iterations of multiple_decrypts.");
+    multiple_decrypts(10);
+    gczeal(0);
+  } else {
+    // We can't use gczeal on non-debug builds, so try lots of reps instead.
+    _("No gczeal (non-debug build?); attempting 10,000 iterations of multiple_decrypts.");
+    multiple_decrypts(10000);
+  }
+}
+
+// Just verify that it gets populated with the correct bytes.
+function test_makeSECItem() {
+  Components.utils.import("resource://gre/modules/ctypes.jsm");
+
+  let item1 = cryptoSvc.makeSECItem("abcdefghi", false);
+  do_check_true(!item1.isNull());
+  let intData = ctypes.cast(item1.contents.data, ctypes.uint8_t.array(8).ptr).contents;
+  for (let i = 0; i < 8; ++i)
+    do_check_eq(intData[i], "abcdefghi".charCodeAt(i));
+}
+
+function test_SECItem_byteCompressInts() {
+  Components.utils.import("resource://gre/modules/ctypes.jsm");
+
+  let item1 = cryptoSvc.makeSECItem("abcdefghi", false);
+  do_check_true(!item1.isNull());
+  let intData = ctypes.cast(item1.contents.data, ctypes.uint8_t.array(8).ptr).contents;
+
+  // Fill it too short.
+  cryptoSvc.byteCompressInts("MMM", intData, 8);
+  for (let i = 0; i < 3; ++i)
+    do_check_eq(intData[i], [77, 77, 77][i]);
+
+  // Fill it too much. Doesn't buffer overrun.
+  cryptoSvc.byteCompressInts("NNNNNNNNNNNNNNNN", intData, 8);
+  for (let i = 0; i < 8; ++i)
+    do_check_eq(intData[i], "NNNNNNNNNNNNNNNN".charCodeAt(i));
+}
+
+function test_encrypt_decrypt() {
+
+  // First, do a normal run with expected usage... Generate a random key and
+  // iv, encrypt and decrypt a string.
+  var iv = cryptoSvc.generateRandomIV();
+  do_check_eq(iv.length, 24);
+
+  var key = cryptoSvc.generateRandomKey();
+  do_check_eq(key.length, 44);
+
+  var mySecret = "bacon is a vegetable";
+  var cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  do_check_eq(cipherText.length, 44);
+
+  var clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(clearText.length, 20);
+  
+  // Did the text survive the encryption round-trip?
+  do_check_eq(clearText, mySecret);
+  do_check_neq(cipherText, mySecret); // just to be explicit
+
+
+  // Do some more tests with a fixed key/iv, to check for reproducable results.
+  key = "St1tFCor7vQEJNug/465dQ==";
+  iv  = "oLjkfrLIOnK2bDRvW4kXYA==";
+
+  _("Testing small IV.");
+  mySecret = "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXo=";
+  shortiv  = "YWJj";           // "abc": Less than 16.
+  let err;
+  try {
+    cryptoSvc.encrypt(mySecret, key, shortiv);
+  } catch (ex) {
+    err = ex;
+  }
+  do_check_true(!!err);
+
+  // Test small input sizes
+  mySecret = "";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "OGQjp6mK1a3fs9k9Ml4L3w==");
+  do_check_eq(clearText, mySecret);
+
+  mySecret = "x";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "96iMl4vhOxFUW/lVHHzVqg==");
+  do_check_eq(clearText, mySecret);
+
+  mySecret = "xx";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "olpPbETRYROCSqFWcH2SWg==");
+  do_check_eq(clearText, mySecret);
+
+  mySecret = "xxx";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "rRbpHGyVSZizLX/x43Wm+Q==");
+  do_check_eq(clearText, mySecret);
+
+  mySecret = "xxxx";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "HeC7miVGDcpxae9RmiIKAw==");
+  do_check_eq(clearText, mySecret);
+
+  // Test non-ascii input
+  // ("testuser1" using similar-looking glyphs)
+  mySecret = String.fromCharCode(355, 277, 349, 357, 533, 537, 101, 345, 185);
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "Pj4ixByXoH3SU3JkOXaEKPgwRAWplAWFLQZkpJd5Kr4=");
+  do_check_eq(clearText, mySecret);
+
+  // Tests input spanning a block boundary (AES block size is 16 bytes)
+  mySecret = "123456789012345";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "e6c5hwphe45/3VN/M0bMUA==");
+  do_check_eq(clearText, mySecret);
+
+  mySecret = "1234567890123456";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "V6aaOZw8pWlYkoIHNkhsP1JOIQF87E2vTUvBUQnyV04=");
+  do_check_eq(clearText, mySecret);
+
+  mySecret = "12345678901234567";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "V6aaOZw8pWlYkoIHNkhsP5GvxWJ9+GIAS6lXw+5fHTI=");
+  do_check_eq(clearText, mySecret);
+
+
+  key = "iz35tuIMq4/H+IYw2KTgow==";
+  iv  = "TJYrvva2KxvkM8hvOIvWp3xgjTXgq5Ss";
+  mySecret = "i like pie";
+
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "DLGx8BWqSCLGG7i/xwvvxg==");
+  do_check_eq(clearText, mySecret);
+
+  key = "c5hG3YG+NC61FFy8NOHQak1ZhMEWO79bwiAfar2euzI=";
+  iv  = "gsgLRDaxWvIfKt75RjuvFWERt83FFsY2A0TW+0b2iVk=";
+  mySecret = "i like pie";
+
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  clearText = cryptoSvc.decrypt(cipherText, key, iv);
+  do_check_eq(cipherText, "o+ADtdMd8ubzNWurS6jt0Q==");
+  do_check_eq(clearText, mySecret);
+
+  key = "St1tFCor7vQEJNug/465dQ==";
+  iv  = "oLjkfrLIOnK2bDRvW4kXYA==";
+  mySecret = "does thunder read testcases?";
+  cipherText = cryptoSvc.encrypt(mySecret, key, iv);
+  do_check_eq(cipherText, "T6fik9Ros+DB2ablH9zZ8FWZ0xm/szSwJjIHZu7sjPs=");
+
+  var badkey    = "badkeybadkeybadkeybadk==";
+  var badiv     = "badivbadivbadivbadivbad=";
+  var badcipher = "crapinputcrapinputcrapinputcrapinputcrapinp=";
+  var failure;
+
+  try {
+    failure = false;
+    clearText = cryptoSvc.decrypt(cipherText, badkey, iv);
+  } catch (e) {
+    failure = true;
+  }
+  do_check_true(failure);
+
+  try {
+    failure = false;
+    clearText = cryptoSvc.decrypt(cipherText, key, badiv);
+  } catch (e) {
+    failure = true;
+  }
+  do_check_true(failure);
+
+  try {
+    failure = false;
+    clearText = cryptoSvc.decrypt(cipherText, badkey, badiv);
+  } catch (e) {
+    failure = true;
+  }
+  do_check_true(failure);
+
+  try {
+    failure = false;
+    clearText = cryptoSvc.decrypt(badcipher, key, iv);
+  } catch (e) {
+    failure = true;
+  }
+  do_check_true(failure);
+}