Implement ChannelIDVerifier using NSS.

net/quic/quic_crypto_server_stream_test.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 "net/quic/quic_crypto_server_stream.h"
 
 #include <map>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 226 matching lines @@
   if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   crypto_config_.SetProofSource(NULL);
   client_options_.dont_verify_certs = true;
 
   // Only 2 client hellos need to be sent in the no-certs case: one to get the
   // source-address token and the second to finish.
-  // TODO(rtenneti): Enable testing of ProofVerifier.

[wtc, 2013/06/12 23:48:21]

This test does not verify certs, so we don't need to change it when
we enable testing of ProofVerifier. Therefore I think this TODO
comment can be removed.

[ramant (doing other things), 2013/06/12 23:53:24]

Sounds great.

   EXPECT_EQ(2, CompleteCryptoHandshake());
   EXPECT_TRUE(stream_.encryption_established());
   EXPECT_TRUE(stream_.handshake_confirmed());
 }
 
-TEST_F(QuicCryptoServerStreamTest, ChannelID) {
+// TODO(rtenneti): Enable testing of ChannelID.
+TEST_F(QuicCryptoServerStreamTest, DISABLED_ChannelID) {
   if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
   client_options_.channel_id_enabled = true;
   // TODO(rtenneti): Enable testing of ProofVerifier.
   EXPECT_EQ(2, CompleteCryptoHandshake());

[wtc, 2013/06/12 23:48:21]

With a real implementation of ChannelIDVerifier::Verify, we get a CHECK
failure deep inside CompleteCryptoHandshake(). (The mock implementation
of ChannelIDVerifier::Verify() always returns true.) So I think we should
simply disable this test.

[ramant (doing other things), 2013/06/12 23:53:24]

This changes sounds good to me. My pending CL has a similar change.

   EXPECT_TRUE(stream_.encryption_established());
   EXPECT_TRUE(stream_.handshake_confirmed());
-  // TODO(rtenneti): Enable testing of ChannelID.
-  // EXPECT_EQ(CryptoTestUtils::ChannelIDKeyForHostname("test.example.com"),
-  //          stream_.crypto_negotiated_params().channel_id);
+  EXPECT_EQ(CryptoTestUtils::ChannelIDKeyForHostname("test.example.com"),
+            stream_.crypto_negotiated_params().channel_id);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net