This change introduces a way to tie source address token keys to specific QUIC server configs

net/quic/crypto/crypto_secret_boxer.h

 // Copyright (c) 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.
 
 #ifndef NET_QUIC_CRYPTO_CRYPTO_SECRET_BOXER_H_
 #define NET_QUIC_CRYPTO_CRYPTO_SECRET_BOXER_H_
 
 #include <string>
 
+#include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
+#include "net/quic/crypto/crypto_protocol.h"

[wtc, 2014/04/22 19:12:10]

We should not need to include this header.

[ramant (doing other things), 2014/04/25 23:40:58]

Done.

+#include "net/quic/crypto/quic_decrypter.h"
+#include "net/quic/crypto/quic_encrypter.h"

[wtc, 2014/04/22 19:12:10]

Nit: using a forward declaration of QuicDecrypter and QuicEncrypter may be
sufficient.

[ramant (doing other things), 2014/04/25 23:40:58]

Was running into compilation errors 
../../net/quic/crypto/crypto_secret_boxer.h:51:17: error: field has incomplete
type 'net::QuicEncrypter'
  QuicEncrypter encrypter_;

[wtc, 2014/04/28 18:44:58]

Now the |encrypter_| member is a scoped_ptr:

  scoped_ptr<QuicEncrypter> encrypter_;

a forward declaration of QuicEncrypter may be enough. In any case, you don't
need to change this.

[ramant (doing other things), 2014/04/29 00:31:18]

Deleted the include files.

Done.

 
 namespace net {
 
 class QuicRandom;
 
 // CryptoSecretBoxer encrypts small chunks of plaintext (called 'boxing') and
 // then, later, can authenticate+decrypt the resulting boxes. This object is
 // thread-safe.
 class NET_EXPORT_PRIVATE CryptoSecretBoxer {
  public:
   // GetKeySize returns the number of bytes in a key.
   static size_t GetKeySize();

[wtc, 2014/04/22 19:12:10]

The Style Guide recommends that static methods should be declared after the
constructor and destructor:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Declaration_Order

[ramant (doing other things), 2014/04/25 23:40:58]

Done.

 
+  // Initializes |encrypter_| and |decrypter_| data members.
+  CryptoSecretBoxer();
+  virtual ~CryptoSecretBoxer();

[wtc, 2014/04/22 19:12:10]

Since this class has no virtual methods, I think the destructor doesn't need to
be virtual.

[ramant (doing other things), 2014/04/25 23:40:58]

Done.

+
   // SetKey sets the key for this object. This must be done before |Box| or
   // |Unbox| are called. |key| must be |GetKeySize()| bytes long.
   void SetKey(base::StringPiece key);
 
   // Box encrypts |plaintext| using a random nonce generated from |rand| and
   // returns the resulting ciphertext. Since an authenticator and nonce are
   // included, the result will be slightly larger than |plaintext|.
   std::string Box(QuicRandom* rand, base::StringPiece plaintext) const;
 
   // Unbox takes the result of a previous call to |Box| in |ciphertext| and
   // authenticates+decrypts it. If |ciphertext| is not authentic then it
   // returns false. Otherwise, |out_storage| is used to store the result and
   // |out| is set to point into |out_storage| and contains the original
   // plaintext.
   bool Unbox(base::StringPiece ciphertext,
              std::string* out_storage,
              base::StringPiece* out) const;
 
  private:
   std::string key_;

[wtc, 2014/04/22 19:12:10]

Remove the key_ member. I explain this in the .cc file.

[ramant (doing other things), 2014/04/25 23:40:58]

nit/small concern: this file is diverging from internal source tree.

Done.

[wtc, 2014/04/28 18:44:58]

That's true. I think we can keep the .h files in sync, but the .cc files will be
different, and we will need to change encrypter_ and decrypter_ back to local
variables in the Box and Unbox methods.

[ramant (doing other things), 2014/04/29 00:31:18]

Done.

+  scoped_ptr<QuicEncrypter> encrypter_;
+  scoped_ptr<QuicDecrypter> decrypter_;
+
+  DISALLOW_COPY_AND_ASSIGN(CryptoSecretBoxer);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CRYPTO_SECRET_BOXER_H_