Fix SpdySession::WriteCredentialFrame ECPrivateKey creation args.

crypto/ec_signature_creator_nss.cc

 // Copyright (c) 2012 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 "crypto/ec_signature_creator.h"
 
 #include <cryptohi.h>
 #include <pk11pub.h>
 #include <secerr.h>
 #include <sechash.h>
@@ skipping 30 matching lines @@
   std::vector<uint8> signature_data(signature_len);
   SECItem sig = {siBuffer, &signature_data[0], signature_len};
   rv = PK11_Sign(key, &sig, &hash);
   if (rv != SECSuccess)
     return rv;
 
   // DER encode the signature.
   return DSAU_EncodeDerSigWithLen(result, &sig, sig.len);
 }
 
-}  // namespace
+class ECSignatureCreatorNSS : public ECSignatureCreator {
+ public:
+  // Private constructor. Use the Create() method instead.
+  explicit ECSignatureCreatorNSS(ECPrivateKey* key);

[Ryan Hamilton, 2012/02/23 04:36:12]

The comment says private, but the access modifier is public:  Is that
intentional?

[mattm, 2012/02/23 04:44:57]

Ah, comment was moved over from the now-abstract ECSignatureCreator class, and
it isn't necessary now since the class is hidden by being in an unnamed
namespace.  Removed the comment.

+  virtual ~ECSignatureCreatorNSS();
 
-// static
-ECSignatureCreator* ECSignatureCreator::Create(ECPrivateKey* key) {
-  return new ECSignatureCreator(key);
-}
+  virtual bool Sign(const uint8* data,
+                    int data_len,
+                    std::vector<uint8>* signature);
 
-ECSignatureCreator::ECSignatureCreator(ECPrivateKey* key)
+ private:
+  ECPrivateKey* key_;
+
+  DISALLOW_COPY_AND_ASSIGN(ECSignatureCreatorNSS);
+};
+
+ECSignatureCreatorNSS::ECSignatureCreatorNSS(ECPrivateKey* key)
     : key_(key) {
   EnsureNSSInit();
 }
 
-ECSignatureCreator::~ECSignatureCreator() { }
+ECSignatureCreatorNSS::~ECSignatureCreatorNSS() { }
 
-bool ECSignatureCreator::Sign(const uint8* data,
-                              int data_len,
-                              std::vector<uint8>* signature) {
+bool ECSignatureCreatorNSS::Sign(const uint8* data,
+                                 int data_len,
+                                 std::vector<uint8>* signature) {
   // Data to be signed
   SECItem secret;
   secret.type = siBuffer;
   secret.len = data_len;
   secret.data = const_cast<unsigned char*>(data);
 
   // SECItem to receive the output buffer.
   SECItem result;
   result.type = siBuffer;
   result.len = 0;
   result.data = NULL;
 
   // Sign the secret data and save it to |result|.
   SECStatus rv =
       SignData(&result, &secret, key_->key(), HASH_AlgSHA1);
   if (rv != SECSuccess) {
     DLOG(ERROR) << "DerSignData: " << PORT_GetError();
     return false;
   }
 
   // Copy the signed data into the output vector.
   signature->assign(result.data, result.data + result.len);
   SECITEM_FreeItem(&result, PR_FALSE /* only free |result.data| */);
   return true;
 }
 
+}  // namespace
+
+// static
+ECSignatureCreator* ECSignatureCreator::CreatePlatformImpl(ECPrivateKey* key) {
+  return new ECSignatureCreatorNSS(key);
+}
+
 }  // namespace crypto