Implements keygen handler for openssl, but without private key persistence

net/base/keygen_handler_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/keygen_handler.h"
 
-#include "build/build_config.h" // Needs to be imported early for USE_NSS
-
-#if defined(USE_NSS)
-#include <private/pprthred.h>  // PR_DetachThread
-#endif
-
 #include <string>
 
+#include "build/build_config.h"
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/nss_util.h"
 #include "base/task.h"
 #include "base/thread_restrictions.h"
 #include "base/waitable_event.h"
 #include "base/worker_pool.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(USE_NSS)
+#include <private/pprthred.h>  // PR_DetachThread
+#endif

[joth, 2010/12/02 17:19:42]

I reordered these as it 2 out of 3 of the lint warning, and a recent email
thread on chromium-dev suggests this is now the preferred style.

+
 namespace net {
 
 namespace {
 
 class KeygenHandlerTest : public ::testing::Test {
  public:
   KeygenHandlerTest() {}
   virtual ~KeygenHandlerTest() {}
 
   virtual void SetUp() {
@@ skipping 32 matching lines @@
   //     Exponent: 65537 (0x10001)
   //     Challenge String: some challenge
   //     Signature Algorithm: md5WithRSAEncryption
   //         92:f3:cc:ff:0b:d3:d0:4a:3a:4c:ba:ff:d6:38:7f:a5:4b:b5: .....
   //   Signature OK
   //
   // The value of |spkac| can be ASN.1-parsed with:
   //    openssl asn1parse -inform DER
 }
 
-// Keygen not yet implemented for OpenSSL: http://crbug.com/64917
-#if defined(USE_OPENSSL)
-#define MAYBE_SmokeTest FAILS_SmokeTest
-#else
-#define MAYBE_SmokeTest SmokeTest
-#endif
-TEST_F(KeygenHandlerTest, MAYBE_SmokeTest) {
+TEST_F(KeygenHandlerTest, SmokeTest) {
   KeygenHandler handler(768, "some challenge", GURL("http://www.example.com"));
   handler.set_stores_key(false);  // Don't leave the key-pair behind
   std::string result = handler.GenKeyAndSignChallenge();
   VLOG(1) << "KeygenHandler produced: " << result;
   AssertValidSignedPublicKeyAndChallenge(result, "some challenge");
 }
 
 class ConcurrencyTestTask : public Task {
  public:
   ConcurrencyTestTask(base::WaitableEvent* event,
                       const std::string& challenge, std::string* result)
       : event_(event),
         challenge_(challenge),
         result_(result) {
   }
 
   virtual void Run() {
     // We allow Singleton use on the worker thread here since we use a
     // WaitableEvent to synchronize, so it's safe.
     base::ThreadRestrictions::ScopedAllowSingleton scoped_allow_singleton;
     KeygenHandler handler(768, "some challenge",
                           GURL("http://www.example.com"));
-    handler.set_stores_key(false); // Don't leave the key-pair behind.
+    handler.set_stores_key(false);  // Don't leave the key-pair behind.
     *result_ = handler.GenKeyAndSignChallenge();
     event_->Signal();
 #if defined(USE_NSS)
     // Detach the thread from NSPR.
     // Calling NSS functions attaches the thread to NSPR, which stores
     // the NSPR thread ID in thread-specific data.
     // The threads in our thread pool terminate after we have called
     // PR_Cleanup.  Unless we detach them from NSPR, net_unittests gets
     // segfaults on shutdown when the threads' thread-specific data
     // destructors run.
     PR_DetachThread();
 #endif
   }
 
  private:
   base::WaitableEvent* event_;
   std::string challenge_;
   std::string* result_;
 };
 
-// Keygen not yet implemented for OpenSSL: http://crbug.com/64917
-#if defined(USE_OPENSSL)
-#define MAYBE_ConcurrencyTest FAILS_ConcurrencyTest
-#else
-#define MAYBE_ConcurrencyTest ConcurrencyTest
-#endif
 // We asynchronously generate the keys so as not to hang up the IO thread. This
 // test tries to catch concurrency problems in the keygen implementation.
-TEST_F(KeygenHandlerTest, MAYBE_ConcurrencyTest) {
+TEST_F(KeygenHandlerTest, ConcurrencyTest) {
   const int NUM_HANDLERS = 5;
   base::WaitableEvent* events[NUM_HANDLERS] = { NULL };
   std::string results[NUM_HANDLERS];
   for (int i = 0; i < NUM_HANDLERS; i++) {
     events[i] = new base::WaitableEvent(false, false);
     WorkerPool::PostTask(FROM_HERE,
                          new ConcurrencyTestTask(events[i], "some challenge",
                                                  &results[i]),
                          true);
   }
 
   for (int i = 0; i < NUM_HANDLERS; i++) {
     // Make sure the job completed
     bool signaled = events[i]->Wait();
     EXPECT_TRUE(signaled);
     delete events[i];
     events[i] = NULL;
 
     VLOG(1) << "KeygenHandler " << i << " produced: " << results[i];
     AssertValidSignedPublicKeyAndChallenge(results[i], "some challenge");
   }
 }
 
 }  // namespace
 
 }  // namespace net