Bug 1073867, Part 5: Make DSS test faster, r=mmc
authorBrian Smith <brian@briansmith.org>
Wed, 24 Dec 2014 17:56:10 -0800
changeset 222362 6ccaa9fe342379c19b5e56c55bef3c37e22e0b7c
parent 222322 33781a3a5201c2371d5d31eeaaaeb5f34a3aaced
child 222363 c71e4fb1d36c094192abfc22d5454b9cfc8bedb9
push id10683
push usercbook@mozilla.com
push dateWed, 07 Jan 2015 13:30:50 +0000
treeherderfx-team@3a1103c584cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmmc
bugs1073867
milestone37.0a1
Bug 1073867, Part 5: Make DSS test faster, r=mmc
security/pkix/test/lib/pkixtestnss.cpp
--- a/security/pkix/test/lib/pkixtestnss.cpp
+++ b/security/pkix/test/lib/pkixtestnss.cpp
@@ -240,30 +240,118 @@ GenerateDSSKeyPair()
 {
   InitNSSIfNeeded();
 
   ScopedPtr<PK11SlotInfo, PK11_FreeSlot> slot(PK11_GetInternalSlot());
   if (!slot) {
     return nullptr;
   }
 
-  PQGParams* pqgParamsTemp = nullptr;
-  PQGVerify* pqgVerify = nullptr;
-  if (PK11_PQG_ParamGenV2(2048u, 256u, 256u / 8u, &pqgParamsTemp, &pqgVerify)
-        != SECSuccess) {
-    return nullptr;
-  }
-  PK11_PQG_DestroyVerify(pqgVerify);
-  ScopedPtr<PQGParams, PK11_PQG_DestroyParams> params(pqgParamsTemp);
+  // XXX: Since it takes over 20 seconds to generate the parameters, we've
+  // taken the parameters generated during one run and hard-coded them for use
+  // in all runs. The parameters were generated from this code:
+  //
+  // PQGParams* pqgParamsTemp = nullptr;
+  // PQGVerify* pqgVerify = nullptr;
+  // if (PK11_PQG_ParamGenV2(2048u, 256u, 256u / 8u, &pqgParamsTemp,
+  //                         &pqgVerify) != SECSuccess) {
+  //  return nullptr;
+  // }
+  // PK11_PQG_DestroyVerify(pqgVerify);
+  // ScopedPtr<PQGParams, PK11_PQG_DestroyParams> params(pqgParamsTemp);
+
+  static const uint8_t P[2048 / 8] = {
+    0xff, 0x09, 0x00, 0x0e, 0x4d, 0x8e, 0xfb, 0x6b,
+    0x01, 0xd9, 0xb2, 0x3a, 0x80, 0xb0, 0xf5, 0xbd,
+    0xe9, 0x21, 0xcf, 0x07, 0xa0, 0x6a, 0xd3, 0x9e,
+    0x5c, 0x0d, 0x2f, 0x13, 0x2e, 0x94, 0x41, 0x96,
+    0x7d, 0xed, 0x90, 0x43, 0x2a, 0x0c, 0x12, 0x75,
+    0xe3, 0x56, 0xa1, 0xb4, 0x59, 0xd4, 0x4f, 0xf3,
+    0x3f, 0x79, 0x9a, 0x7d, 0xe9, 0x51, 0xb7, 0xe2,
+    0x07, 0x0f, 0x51, 0xc7, 0x68, 0x2b, 0x82, 0x3c,
+    0xa4, 0x8c, 0xdc, 0x31, 0xe0, 0x80, 0xb3, 0x6a,
+    0x30, 0xd5, 0xcb, 0xc7, 0x9e, 0xe6, 0xda, 0xee,
+    0x92, 0x87, 0xdf, 0x85, 0x19, 0xf0, 0xe5, 0x24,
+    0x4b, 0xb4, 0xce, 0x69, 0xd0, 0x46, 0x08, 0x3a,
+    0x1f, 0xf4, 0x98, 0x43, 0x2b, 0x0f, 0xb6, 0xd7,
+    0xf2, 0x57, 0xac, 0x2b, 0xbb, 0x85, 0x5c, 0x67,
+    0xdd, 0x22, 0xab, 0x50, 0xd8, 0x69, 0x1e, 0xbe,
+    0xa2, 0xb6, 0x2d, 0xae, 0xbb, 0xf6, 0x27, 0x41,
+    0x4f, 0x92, 0x04, 0x4f, 0x99, 0x15, 0x07, 0x52,
+    0x22, 0xdf, 0x92, 0xea, 0xee, 0x05, 0xdc, 0xd7,
+    0x23, 0x3d, 0x63, 0xc1, 0xe0, 0x92, 0x3d, 0x1a,
+    0xbe, 0x53, 0xab, 0x5f, 0x6a, 0x8b, 0xca, 0x6c,
+    0x86, 0x8e, 0xe7, 0xf9, 0x15, 0x62, 0xd5, 0x33,
+    0xf4, 0x19, 0x3b, 0x58, 0x4e, 0xb7, 0x4f, 0xd3,
+    0xdd, 0x91, 0x34, 0xae, 0x55, 0x11, 0x38, 0xd9,
+    0x5d, 0x4a, 0xa0, 0xad, 0xf1, 0xea, 0x54, 0xf8,
+    0xda, 0x50, 0x6e, 0xb2, 0x94, 0xa9, 0x95, 0x58,
+    0x70, 0x55, 0x74, 0x3c, 0xb8, 0x57, 0xe6, 0x5a,
+    0x65, 0x3f, 0x4f, 0x17, 0x32, 0xb3, 0x0b, 0x09,
+    0xcd, 0x4f, 0x5a, 0x53, 0x04, 0xbf, 0xd7, 0x4d,
+    0xb4, 0x3d, 0x1a, 0x5b, 0xb8, 0x5d, 0xd9, 0x35,
+    0x8a, 0x56, 0x6c, 0x48, 0x1e, 0x42, 0x7b, 0x54,
+    0xc4, 0xbb, 0x57, 0x16, 0xb5, 0x49, 0x79, 0x1c,
+    0xaa, 0x90, 0x5b, 0x2b, 0x0b, 0x96, 0x92, 0x8d
+  };
+
+  static const uint8_t Q[256 / 8] = {
+    0xd2, 0x5c, 0xab, 0xa7, 0xac, 0x92, 0x39, 0xa4,
+    0x20, 0xc1, 0x7d, 0x2f, 0x81, 0xb0, 0x6a, 0x81,
+    0xa6, 0xdc, 0xc3, 0xfa, 0xae, 0x7f, 0x78, 0x82,
+    0xa1, 0xc7, 0xf4, 0x59, 0x62, 0x11, 0x6c, 0x67
+  };
+
+  static const uint8_t G[2048 / 8] = {
+    0xde, 0x50, 0x3b, 0x1d, 0xf0, 0x82, 0xa0, 0x0a,
+    0x80, 0x61, 0xed, 0x77, 0x8a, 0x0d, 0x04, 0xdc,
+    0x16, 0x03, 0x4a, 0x24, 0x3a, 0x0e, 0x44, 0x8d,
+    0xef, 0x94, 0x4a, 0x50, 0x5e, 0x5d, 0xa9, 0xb4,
+    0x19, 0x6b, 0xc8, 0x73, 0xb1, 0xc6, 0xb9, 0x61,
+    0xc1, 0x81, 0x9e, 0x8d, 0x8e, 0xd7, 0x74, 0x14,
+    0xba, 0xd2, 0x30, 0x03, 0x2d, 0xf6, 0xb4, 0xe2,
+    0x40, 0xdd, 0xbe, 0xe6, 0x1b, 0x1c, 0x11, 0xab,
+    0x80, 0x08, 0x34, 0x96, 0xe0, 0x0b, 0x4d, 0xa5,
+    0x3b, 0x5e, 0xee, 0xc0, 0x6d, 0xac, 0x05, 0x8d,
+    0x45, 0x7a, 0xb7, 0x8d, 0x22, 0x42, 0x35, 0x5e,
+    0x36, 0xff, 0xcf, 0x42, 0x10, 0x43, 0x07, 0x94,
+    0xbf, 0x59, 0xad, 0xc3, 0x10, 0xd0, 0xc1, 0xfb,
+    0xe3, 0x06, 0x40, 0x76, 0x88, 0xf6, 0xc5, 0x46,
+    0xf1, 0x3d, 0x26, 0xb8, 0xa5, 0x18, 0xd5, 0x5c,
+    0xe4, 0x46, 0x96, 0x3f, 0xe1, 0x90, 0x39, 0xa3,
+    0xa4, 0x64, 0x3c, 0xd1, 0xc6, 0x70, 0xeb, 0xeb,
+    0xd1, 0x7c, 0x53, 0x14, 0x2c, 0xa3, 0xdf, 0x70,
+    0x86, 0xbf, 0xbf, 0x08, 0xed, 0xc6, 0x54, 0xc3,
+    0xc6, 0xcc, 0xe5, 0xcd, 0xc5, 0x21, 0x9b, 0x07,
+    0xf7, 0xd5, 0x10, 0x9a, 0xd4, 0x83, 0xb6, 0x5b,
+    0x1c, 0x2e, 0xd1, 0x53, 0xdb, 0x53, 0x52, 0xcd,
+    0xda, 0x48, 0x60, 0x2c, 0x99, 0x1f, 0x00, 0xde,
+    0x7a, 0x45, 0xaa, 0x15, 0xb0, 0xd4, 0xfb, 0x9c,
+    0xf3, 0x17, 0xc9, 0x32, 0x49, 0x13, 0xf3, 0xe6,
+    0x73, 0x0b, 0x4e, 0x8b, 0x01, 0xf1, 0xb5, 0x9e,
+    0xa7, 0xa7, 0x8a, 0x46, 0xcd, 0xb7, 0xee, 0xf0,
+    0x0d, 0xee, 0x90, 0x2f, 0x09, 0xe1, 0x9d, 0xe9,
+    0x59, 0x84, 0xd6, 0xb6, 0xf1, 0xb2, 0x27, 0xc1,
+    0x7a, 0xd8, 0x37, 0xb8, 0x6a, 0xb9, 0xd1, 0x58,
+    0x78, 0xad, 0x0f, 0xa5, 0xac, 0xea, 0x79, 0x8b,
+    0x27, 0x79, 0xcf, 0x6c, 0x11, 0xbe, 0x9c, 0xac
+  };
+
+  static const PQGParams PARAMS = {
+    nullptr,
+    { siBuffer, const_cast<uint8_t*>(P), sizeof(P) },
+    { siBuffer, const_cast<uint8_t*>(Q), sizeof(Q) },
+    { siBuffer, const_cast<uint8_t*>(G), sizeof(G) }
+  };
 
   SECKEYPublicKey* publicKeyTemp = nullptr;
   ScopedSECKEYPrivateKey
     privateKey(PK11_GenerateKeyPair(slot.get(), CKM_DSA_KEY_PAIR_GEN,
-                                    params.get(), &publicKeyTemp, false, true,
-                                    nullptr));
+                                    const_cast<PQGParams*>(&PARAMS),
+                                    &publicKeyTemp, false, true, nullptr));
   if (!privateKey) {
     return nullptr;
   }
   ScopedSECKEYPublicKey publicKey(publicKeyTemp);
 
   ScopedSECItem spkiDER(SECKEY_EncodeDERSubjectPublicKeyInfo(publicKey.get()));
   if (!spkiDER) {
     return nullptr;