Backed out changeset bf3359ddd831 (bug 1026398)
authorEd Morley <emorley@mozilla.com>
Fri, 11 Jul 2014 17:01:07 +0100
changeset 193605 ad6aaa154f38313a61fe3bbec965dd119b5ab0cd
parent 193604 8159de6c90c59ba367bf9a3d1ef1a7c92bf9bc5b
child 193606 9e77266536d55c49ccaad99cd2f2b2cd2424e3c1
push id27123
push userryanvm@gmail.com
push dateFri, 11 Jul 2014 20:35:05 +0000
treeherdermozilla-central@84bd8d9f4256 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1026398
milestone33.0a1
backs outbf3359ddd83119dec45620cdccad414eac85b8ec
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset bf3359ddd831 (bug 1026398)
dom/crypto/test/test-vectors.js
dom/crypto/test/tests.js
--- a/dom/crypto/test/test-vectors.js
+++ b/dom/crypto/test/test-vectors.js
@@ -305,53 +305,9 @@ tv = {
     ),
     sig_fail: util.hex2abv(
       "8000000080e5c7b4b5e672929f664c4896e50c35134b6de4d5a934252a3a245f" +
       "f48340920e1034b7d5a5b524eb0e1cf12befef49b27b732d2c19e1c43217d6e1" +
       "417381111a1d36de6375cf455b3c9812639dbc27600c751994fb61799ecf7da6" +
       "bcf51540afd0174db4033188556675b1d763360af46feeca5b60f882829ee7b2"
     ),
   },
-
-  // RSA test vectors, oaep-vect.txt, Example 1.1: A 1024-bit RSA Key Pair
-  // <ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1-vec.zip>
-  rsaoaep: {
-    pkcs8: util.hex2abv(
-      "30820276020100300d06092a864886f70d0101010500048202603082025c0201" +
-      "0002818100a8b3b284af8eb50b387034a860f146c4919f318763cd6c5598c8ae" +
-      "4811a1e0abc4c7e0b082d693a5e7fced675cf4668512772c0cbc64a742c6c630" +
-      "f533c8cc72f62ae833c40bf25842e984bb78bdbf97c0107d55bdb662f5c4e0fa" +
-      "b9845cb5148ef7392dd3aaff93ae1e6b667bb3d4247616d4f5ba10d4cfd226de" +
-      "88d39f16fb020301000102818053339cfdb79fc8466a655c7316aca85c55fd8f" +
-      "6dd898fdaf119517ef4f52e8fd8e258df93fee180fa0e4ab29693cd83b152a55" +
-      "3d4ac4d1812b8b9fa5af0e7f55fe7304df41570926f3311f15c4d65a732c4831" +
-      "16ee3d3d2d0af3549ad9bf7cbfb78ad884f84d5beb04724dc7369b31def37d0c" +
-      "f539e9cfcdd3de653729ead5d1024100d32737e7267ffe1341b2d5c0d150a81b" +
-      "586fb3132bed2f8d5262864a9cb9f30af38be448598d413a172efb802c21acf1" +
-      "c11c520c2f26a471dcad212eac7ca39d024100cc8853d1d54da630fac004f471" +
-      "f281c7b8982d8224a490edbeb33d3e3d5cc93c4765703d1dd791642f1f116a0d" +
-      "d852be2419b2af72bfe9a030e860b0288b5d7702400e12bf1718e9cef5599ba1" +
-      "c3882fe8046a90874eefce8f2ccc20e4f2741fb0a33a3848aec9c9305fbecbd2" +
-      "d76819967d4671acc6431e4037968db37878e695c102410095297b0f95a2fa67" +
-      "d00707d609dfd4fc05c89dafc2ef6d6ea55bec771ea333734d9251e79082ecda" +
-      "866efef13c459e1a631386b7e354c899f5f112ca85d7158302404f456c502493" +
-      "bdc0ed2ab756a3a6ed4d67352a697d4216e93212b127a63d5411ce6fa98d5dbe" +
-      "fd73263e3728142743818166ed7dd63687dd2a8ca1d2f4fbd8e1"
-    ),
-    spki: util.hex2abv(
-      "30819f300d06092a864886f70d010101050003818d0030818902818100a8b3b2" +
-      "84af8eb50b387034a860f146c4919f318763cd6c5598c8ae4811a1e0abc4c7e0" +
-      "b082d693a5e7fced675cf4668512772c0cbc64a742c6c630f533c8cc72f62ae8" +
-      "33c40bf25842e984bb78bdbf97c0107d55bdb662f5c4e0fab9845cb5148ef739" +
-      "2dd3aaff93ae1e6b667bb3d4247616d4f5ba10d4cfd226de88d39f16fb020301" +
-      "0001"
-    ),
-    data: util.hex2abv(
-      "6628194e12073db03ba94cda9ef9532397d50dba79b987004afefe34"
-    ),
-    result: util.hex2abv(
-      "354fe67b4a126d5d35fe36c777791a3f7ba13def484e2d3908aff722fad468fb" +
-      "21696de95d0be911c2d3174f8afcc201035f7b6d8e69402de5451618c21a535f" +
-      "a9d7bfc5b8dd9fc243f8cf927db31322d6e881eaa91a996170e657a05a266426" +
-      "d98c88003f8477c1227094a0d9fa1e8c4024309ce1ecccb5210035d47ac72e8a"
-    ),
-  },
 }
--- a/dom/crypto/test/tests.js
+++ b/dom/crypto/test/tests.js
@@ -149,17 +149,17 @@ TestArray.addTest(
   }
 );
 
 // -----------------------------------------------------------------------------
 TestArray.addTest(
   "Import / export round-trip with 'pkcs8'",
   function() {
     var that = this;
-    var alg = { name: "RSASSA-PKCS1-v1_5", hash: "SHA-1" };
+    var alg = { name: "RSASSA-PKCS1-v1_5", hash: "SHA1" };
 
     function doExport(x) {
       if (!hasKeyFields(x)) {
         throw "Invalid key; missing field(s)";
       } else if ((x.algorithm.name != alg.name) ||
         (x.algorithm.hash.name != alg.hash) ||
         (x.algorithm.modulusLength != 512) ||
         (x.algorithm.publicExponent.byteLength != 3) ||
@@ -181,17 +181,17 @@ TestArray.addTest(
   }
 );
 
 // -----------------------------------------------------------------------------
 TestArray.addTest(
   "Import failure with format 'pkcs8'",
   function() {
     var that = this;
-    var alg = { name: "RSASSA-PKCS1-v1_5", hash: "SHA-1" };
+    var alg = { name: "RSASSA-PKCS1-v1_5", hash: "SHA1" };
 
     crypto.subtle.importKey("pkcs8", tv.negative_pkcs8, alg, true, ["encrypt"])
       .then(error(that), complete(that));
   }
 );
 
 // -----------------------------------------------------------------------------
 TestArray.addTest(
@@ -1013,130 +1013,9 @@ TestArray.addTest(
       .then( doVerify, fail )
       .then(
         complete(that, function(x) { return !x; }),
         fail
       );
   }
 );
 
-// -----------------------------------------------------------------------------
-TestArray.addTest(
-  "RSA-OAEP encrypt/decrypt round-trip",
-  function () {
-    var that = this;
-    var privKey, pubKey;
-    var alg = {name: "RSA-OAEP", hash: "SHA-1"};
 
-    var privKey, pubKey;
-    function setPriv(x) { privKey = x; }
-    function setPub(x) { pubKey = x; }
-    function doEncrypt() {
-      return crypto.subtle.encrypt(alg, pubKey, tv.rsaoaep.data);
-    }
-    function doDecrypt(x) {
-      return crypto.subtle.decrypt(alg, privKey, x);
-    }
-
-    Promise.all([
-      crypto.subtle.importKey("pkcs8", tv.rsaoaep.pkcs8, alg, false, ['decrypt'])
-          .then(setPriv, error(that)),
-      crypto.subtle.importKey("spki", tv.rsaoaep.spki, alg, false, ['encrypt'])
-          .then(setPub, error(that))
-    ]).then(doEncrypt, error(that))
-      .then(doDecrypt, error(that))
-      .then(
-        memcmp_complete(that, tv.rsaoaep.data),
-        error(that)
-      );
-  }
-);
-
-// -----------------------------------------------------------------------------
-TestArray.addTest(
-  "RSA-OAEP key generation and encrypt/decrypt round-trip (SHA-256)",
-  function () {
-    var that = this;
-    var alg = {
-      name: "RSA-OAEP",
-      hash: "SHA-256",
-      modulusLength: 2048,
-      publicExponent: new Uint8Array([0x01, 0x00, 0x01])
-    };
-
-    var privKey, pubKey, data = crypto.getRandomValues(new Uint8Array(128));
-    function setKey(x) { pubKey = x.publicKey; privKey = x.privateKey; }
-    function doEncrypt() {
-      return crypto.subtle.encrypt(alg, pubKey, data);
-    }
-    function doDecrypt(x) {
-      return crypto.subtle.decrypt(alg, privKey, x);
-    }
-
-    crypto.subtle.generateKey(alg, false, ['encrypt', 'decrypt'])
-      .then(setKey, error(that))
-      .then(doEncrypt, error(that))
-      .then(doDecrypt, error(that))
-      .then(
-        memcmp_complete(that, data),
-        error(that)
-      );
-  }
-);
-
-// -----------------------------------------------------------------------------
-TestArray.addTest(
-  "RSA-OAEP decryption known answer",
-  function () {
-    var that = this;
-    var alg = {name: "RSA-OAEP", hash: "SHA-1"};
-
-    function doDecrypt(x) {
-      return crypto.subtle.decrypt(alg, x, tv.rsaoaep.result);
-    }
-    function fail() { error(that); }
-
-    crypto.subtle.importKey("pkcs8", tv.rsaoaep.pkcs8, alg, false, ['decrypt'])
-      .then( doDecrypt, fail )
-      .then( memcmp_complete(that, tv.rsaoaep.data), fail );
-  }
-);
-
-// -----------------------------------------------------------------------------
-TestArray.addTest(
-  "RSA-OAEP input data length checks (2048-bit key)",
-  function () {
-    var that = this;
-    var privKey, pubKey;
-    var alg = {
-      name: "RSA-OAEP",
-      hash: "SHA-1",
-      modulusLength: 2048,
-      publicExponent: new Uint8Array([0x01, 0x00, 0x01])
-    };
-
-    var privKey, pubKey;
-    function setKey(x) { pubKey = x.publicKey; privKey = x.privateKey; }
-    function doEncrypt(n) {
-      return function () {
-        return crypto.subtle.encrypt(alg, pubKey, new Uint8Array(n));
-      }
-    }
-
-    crypto.subtle.generateKey(alg, false, ['encrypt'])
-      .then(setKey, error(that))
-      .then(doEncrypt(214), error(that))
-      .then(doEncrypt(215), error(that))
-      .then(error(that), complete(that));
-  }
-);
-
-// -----------------------------------------------------------------------------
-TestArray.addTest(
-  "RSA-OAEP key import with invalid hash",
-  function () {
-    var that = this;
-    var alg = {name: "RSA-OAEP", hash: "SHA-123"};
-
-    crypto.subtle.importKey("pkcs8", tv.rsaoaep.pkcs8, alg, false, ['decrypt'])
-      .then(error(that), complete(that));
-  }
-);