Send the ClientHello handshake message. Fix a bug in

net/quic/crypto/crypto_protocol.h

Index: net/quic/crypto/crypto_protocol.h
===================================================================
--- net/quic/crypto/crypto_protocol.h	(revision 174485)
+++ net/quic/crypto/crypto_protocol.h	(working copy)
@@ -6,17 +6,17 @@
 #define NET_QUIC_CRYPTO_CRYPTO_PROTOCOL_H_
 
 #include <map>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/string_piece.h"
 #include "net/base/net_export.h"
 
 namespace net {
 
 typedef uint32 CryptoTag;
-typedef std::map<CryptoTag, base::StringPiece> CryptoTagValueMap;
+typedef std::map<CryptoTag, std::string> CryptoTagValueMap;
 typedef std::vector<CryptoTag> CryptoTagVector;
 struct NET_EXPORT_PRIVATE CryptoHandshakeMessage {
   CryptoHandshakeMessage();
@@ -36,12 +36,59 @@
 const CryptoTag kCHLO = MAKE_TAG('C', 'H', 'L', 'O');  // Client hello
 const CryptoTag kSHLO = MAKE_TAG('S', 'H', 'L', 'O');  // Server hello
 
+// Key exchange methods
+const CryptoTag kP256 = MAKE_TAG('P', '2', '5', '6');  // ECDH, Curve P-256
+const CryptoTag kC255 = MAKE_TAG('C', '2', '5', '5');  // ECDH, Curve25519
+
 // AEAD algorithms
 const CryptoTag kNULL = MAKE_TAG('N', 'U', 'L', 'L');  // null algorithm
 const CryptoTag kAESH = MAKE_TAG('A', 'E', 'S', 'H');  // AES128 + SHA256
+const CryptoTag kAESG = MAKE_TAG('A', 'E', 'S', 'G');  // AES128 + GCM
 
+// Congestion control feedback types
+const CryptoTag kQBIC = MAKE_TAG('Q', 'B', 'I', 'C');  // TCP cubic
+const CryptoTag kINAR = MAKE_TAG('I', 'N', 'A', 'R');  // Inter arrival
+
+// Client hello tags
+const CryptoTag kVERS = MAKE_TAG('V', 'E', 'R', 'S');  // Version
+const CryptoTag kNONC = MAKE_TAG('N', 'O', 'N', 'C');  // The connection nonce
+const CryptoTag kSSID = MAKE_TAG('S', 'S', 'I', 'D');  // Session ID
+const CryptoTag kKEXS = MAKE_TAG('K', 'E', 'X', 'S');  // Key exchange methods
+const CryptoTag kAEAD = MAKE_TAG('A', 'E', 'A', 'D');  // Authenticated
+                                                       // encryption algorithms
+const CryptoTag kCGST = MAKE_TAG('C', 'G', 'S', 'T');  // Congestion control
+                                                       // feedback types
+const CryptoTag kICSL = MAKE_TAG('I', 'C', 'S', 'L');  // Idle connection state
+                                                       // lifetime
+const CryptoTag kKATO = MAKE_TAG('K', 'A', 'T', 'O');  // Keepalive timeout
+const CryptoTag kSNI = MAKE_TAG('S', 'N', 'I', '\0');  // Server name
+                                                       // indication
+const CryptoTag kPUBS = MAKE_TAG('P', 'U', 'B', 'S');  // Public key values
+
 const size_t kMaxEntries = 16;  // Max number of entries in a message.
 
+const size_t kNonceSize = 32;  // Size in bytes of the connection nonce.
+
+// Data members for encoding the ClientHello message.
+struct QuicClientHelloConfig {

[wtc, 2012/12/22 04:21:51]

Should I define this struct in this header or in its own
header?

quic_protocol.h defines several structs, which is why I
just define this struct in this header.

[Ryan Hamilton, 2012/12/22 22:31:32]

Defining it here seems fine to me.  However, I think I'd call it
QuicClientHelloMessage (instead of Config).  This is analogous to the various
Quic*Frame structs we have which define an in-memory representation of the
frames.

+  QuicClientHelloConfig();
+
+  // Protocol version
+  uint16 version;
+  // Key exchange methods
+  CryptoTagVector key_exchange;
+  // Authenticated encryption with associated data (AEAD) algorithms
+  CryptoTagVector aead;
+  // Congestion control feedback types
+  CryptoTagVector congestion_control;
+  // Idle connection state lifetime, in seconds
+  uint32 idle_connection_state_lifetime;

[Ryan Hamilton, 2012/12/22 22:31:32]

Can we make this a QuicTime::Delta?  (In-memory, times should be QuicTime and
deltas should be QuicTime::Delta.  We only switch to integers when we go to/from
the wire).

+  // Keepalive timeout, in seconds, or 0 to turn off keepalive probes
+  uint32 keepalive_timeout;

[Ryan Hamilton, 2012/12/22 22:31:32]

Ditto.

+  // Server's hostname
+  std::string server_hostname;
+};
+
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CRYPTO_PROTOCOL_H_