Add a unit test to check KeygenHandler's thread-safety

net/third_party/mozilla_security_manager/nsKeygenHandler.cpp

 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
@@ skipping 23 matching lines @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "net/third_party/mozilla_security_manager/nsKeygenHandler.h"
 
 #include <pk11pub.h>
+#include <prerror.h>   // PR_GetError()
 #include <secmod.h>
 #include <secder.h>    // DER_Encode()
 #include <cryptohi.h>  // SEC_DerSignData()
 #include <keyhi.h>     // SECKEY_CreateSubjectPublicKeyInfo()
 
 #include "base/base64.h"
 #include "base/nss_util_internal.h"
 #include "base/nss_util.h"
 #include "base/logging.h"
 #include "net/base/keygen_handler.h"
@@ skipping 103 matching lines @@
   // Need to make sure that the token was initialized.
   // Assume a null password.
   sec_rv = PK11_Authenticate(slot, PR_TRUE, NULL);
   if (SECSuccess != sec_rv) {
     LOG(ERROR) << "Couldn't initialze PK11 token!";
     isSuccess = false;
     goto failure;
   }
 
   LOG(INFO) << "Creating key pair...";
-  privateKey = PK11_GenerateKeyPair(slot,
-                                    keyGenMechanism,
-                                    keyGenParams,
-                                    &publicKey,
-                                    PR_TRUE,  // isPermanent?
-                                    PR_TRUE,  // isSensitive?
-                                    NULL);
+  {
+    base::AutoNSSWriteLock lock;
+    privateKey = PK11_GenerateKeyPair(slot,
+                                      keyGenMechanism,
+                                      keyGenParams,
+                                      &publicKey,
+                                      PR_TRUE,  // isPermanent?
+                                      PR_TRUE,  // isSensitive?
+                                      NULL);
+  }
   LOG(INFO) << "done.";
 
   if (!privateKey) {
     LOG(INFO) << "Generation of Keypair failed!";
     isSuccess = false;
     goto failure;
   }
 
   // The CA expects the signed public key in a specific format
   // Let's create that now.
@@ skipping 54 matching lines @@
                           &result_blob)) {
     LOG(ERROR) << "Couldn't convert signed public key into base64";
     isSuccess = false;
     goto failure;
   }
 
   StoreKeyLocationInCache(spkiItem, slot);
 
  failure:
   if (!isSuccess) {
-    LOG(ERROR) << "SSL Keygen failed!";
+    LOG(ERROR) << "SSL Keygen failed! (NSS error code " << PR_GetError() << ")";
   } else {
     LOG(INFO) << "SSL Keygen succeeded!";
   }
 
   // Do cleanups
   if (privateKey) {
     // On successful keygen we need to keep the private key, of course,
     // or we won't be able to use the client certificate.
     if (!isSuccess || !stores_key) {
+      base::AutoNSSWriteLock lock;
       PK11_DestroyTokenObject(privateKey->pkcs11Slot, privateKey->pkcs11ID);
     }
     SECKEY_DestroyPrivateKey(privateKey);
   }
 
   if (publicKey) {
     if (!isSuccess || !stores_key) {
+      base::AutoNSSWriteLock lock;
       PK11_DestroyTokenObject(publicKey->pkcs11Slot, publicKey->pkcs11ID);
     }
     SECKEY_DestroyPublicKey(publicKey);
   }
   if (spkInfo) {
     SECKEY_DestroySubjectPublicKeyInfo(spkInfo);
   }
   if (arena) {
     PORT_FreeArena(arena, PR_TRUE);
   }
   if (slot != NULL) {
     PK11_FreeSlot(slot);
   }
   if (pkac.challenge.data) {
     free(pkac.challenge.data);
   }
 
   return (isSuccess ? result_blob : std::string());
 }
 
 }  // namespace mozilla_security_manager