Land Recent QUIC changes

net/quic/crypto/p256_key_exchange_nss.cc

 // 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.
 
 #include "net/quic/crypto/p256_key_exchange.h"
 
 #include "base/logging.h"
 #include "base/sys_byteorder.h"
 
 using base::StringPiece;
@@ skipping 131 matching lines @@
   private_key_size = base::ByteSwapToLE16(private_key_size);
   memcpy(resultp, &private_key_size, sizeof(private_key_size));
   resultp += sizeof(private_key_size);
   memcpy(resultp, &private_key[0], private_key.size());
   resultp += private_key.size();
   memcpy(resultp, &public_key[0], public_key.size());
 
   return string(&result[0], result_size);
 }
 
-bool P256KeyExchange::CalculateSharedKey(
-    const StringPiece& peer_public_value,
-    string* out_result) const {
+KeyExchange* P256KeyExchange::NewKeyPair(QuicRandom* /*rand*/) const {
+  // TODO(agl): avoid the serialisation/deserialisation in this function.
+  const string private_value = NewPrivateKey();
+  return P256KeyExchange::New(private_value);
+}
+
+bool P256KeyExchange::CalculateSharedKey(const StringPiece& peer_public_value,
+                                         string* out_result) const {
   if (peer_public_value.size() != kUncompressedP256PointBytes ||
       peer_public_value[0] != kUncompressedECPointForm) {
     DLOG(INFO) << "Peer public value is invalid.";
     return false;
   }
 
   DCHECK(key_pair_.get());
   DCHECK(key_pair_->public_key());
 
   SECKEYPublicKey peer_public_key;
@@ skipping 50 matching lines @@
 
   out_result->assign(reinterpret_cast<char*>(key_data->data), key_data->len);
   return true;
 }
 
 StringPiece P256KeyExchange::public_value() const {
   return StringPiece(reinterpret_cast<const char*>(public_key_),
                      sizeof(public_key_));
 }
 
-CryptoTag P256KeyExchange::tag() const {
-  return kP256;
-}
+QuicTag P256KeyExchange::tag() const { return kP256; }
 
 }  // namespace net