Change the prototype of ChannelIDSource::GetChannelIDKey() to allow an

net/quic/test_tools/crypto_test_utils_openssl.cc

 // Copyright 2013 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/quic/test_tools/crypto_test_utils.h"
 
 #include <openssl/bn.h>
 #include <openssl/ec.h>
 #include <openssl/ecdsa.h>
 #include <openssl/evp.h>
@@ skipping 20 matching lines @@
 namespace test {
 
 class TestChannelIDKey : public ChannelIDKey {
  public:
   explicit TestChannelIDKey(EVP_PKEY* ecdsa_key) : ecdsa_key_(ecdsa_key) {}
   virtual ~TestChannelIDKey() { }
 
   // ChannelIDKey implementation.
 
   virtual bool Sign(StringPiece signed_data,
-                    string* out_signature) OVERRIDE {
+                    string* out_signature) const OVERRIDE {
     EVP_MD_CTX md_ctx;
     EVP_MD_CTX_init(&md_ctx);
     crypto::ScopedOpenSSL<EVP_MD_CTX, EvpMdCtxCleanUp>
         md_ctx_cleanup(&md_ctx);
 
     if (EVP_DigestSignInit(&md_ctx, NULL, EVP_sha256(), NULL,
                            ecdsa_key_.get()) != 1) {
       return false;
     }
 
@@ skipping 26 matching lines @@
     memset(signature.get(), 0, kSignatureLength);
     BN_bn2bin(sig.get()->r, signature.get() + 32 - BN_num_bytes(sig.get()->r));
     BN_bn2bin(sig.get()->s, signature.get() + 64 - BN_num_bytes(sig.get()->s));
 
     *out_signature = string(reinterpret_cast<char*>(signature.get()),
                             kSignatureLength);
 
     return true;
   }
 
-  virtual string SerializeKey() OVERRIDE {
+  virtual string SerializeKey() const OVERRIDE {
     // i2d_PublicKey will produce an ANSI X9.62 public key which, for a P-256
     // key, is 0x04 (meaning uncompressed) followed by the x and y field
     // elements as 32-byte, big-endian numbers.
     static const int kExpectedKeyLength = 65;
 
     int len = i2d_PublicKey(ecdsa_key_.get(), NULL);
     if (len != kExpectedKeyLength) {
       return "";
     }
 
     uint8 buf[kExpectedKeyLength];
     uint8* derp = buf;
     i2d_PublicKey(ecdsa_key_.get(), &derp);
 
     return string(reinterpret_cast<char*>(buf + 1), kExpectedKeyLength - 1);
   }
 
  private:
   crypto::ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> ecdsa_key_;
 };
 
 class TestChannelIDSource : public ChannelIDSource {
  public:
   virtual ~TestChannelIDSource() {}
 
   // ChannelIDSource implementation.
 
-  virtual bool GetChannelIDKey(
+  virtual QuicAsyncStatus GetChannelIDKey(
       const string& hostname,
-      scoped_ptr<ChannelIDKey>* channel_id_key) OVERRIDE {
+      scoped_ptr<ChannelIDKey>* channel_id_key,
+      ChannelIDSourceCallback* /*callback*/) OVERRIDE {
     channel_id_key->reset(new TestChannelIDKey(HostnameToKey(hostname)));
-    return true;
+    return QUIC_SUCCESS;
   }
 
  private:
   static EVP_PKEY* HostnameToKey(const string& hostname) {
     // In order to generate a deterministic key for a given hostname the
     // hostname is hashed with SHA-256 and the resulting digest is treated as a
     // big-endian number. The most-significant bit is cleared to ensure that
     // the resulting value is less than the order of the group and then it's
     // taken as a private key. Given the private key, the public key is
     // calculated with a group multiplication.
@@ skipping 35 matching lines @@
 };
 
 // static
 ChannelIDSource* CryptoTestUtils::ChannelIDSourceForTesting() {
   return new TestChannelIDSource();
 }
 
 }  // namespace test
 
 }  // namespace net