Provide valid port on HPKP reports for QUIC connections

net/quic/crypto/proof_test.cc

Index: net/quic/crypto/proof_test.cc
diff --git a/net/quic/crypto/proof_test.cc b/net/quic/crypto/proof_test.cc
index 0b0f26ce101bc0933e019f472584d66582509bab..5fa8052040f8d6e45d206527598a324a5d484288 100644
--- a/net/quic/crypto/proof_test.cc
+++ b/net/quic/crypto/proof_test.cc
@@ -56,6 +56,7 @@ class TestProofVerifierCallback : public ProofVerifierCallback {
 // matches |expected_ok|.
 void RunVerification(ProofVerifier* verifier,
                      const string& hostname,
+                     const uint16_t port,
                      const string& server_config,
                      const vector<string>& certs,
                      const string& proof,
@@ -70,7 +71,7 @@ void RunVerification(ProofVerifier* verifier,
       new TestProofVerifierCallback(&comp_callback, &ok, &error_details);
 
   QuicAsyncStatus status = verifier->VerifyProof(
-      hostname, server_config, certs, "", proof, verify_context.get(),
+      hostname, port, server_config, certs, "", proof, verify_context.get(),
       &error_details, &details, callback);
 
   switch (status) {
@@ -114,6 +115,7 @@ TEST(ProofTest, DISABLED_Verify) {
 
   const string server_config = "server config bytes";
   const string hostname = "test.example.com";
+  const uint16_t port = 8443;
   scoped_refptr<ProofSource::Chain> chain;
   scoped_refptr<ProofSource::Chain> first_chain;
   string error_details, signature, first_signature, first_cert_sct, cert_sct;
@@ -131,24 +133,24 @@ TEST(ProofTest, DISABLED_Verify) {
   ASSERT_EQ(signature, first_signature);
   ASSERT_EQ(first_cert_sct, cert_sct);
 
-  RunVerification(verifier.get(), hostname, server_config, chain->certs,
+  RunVerification(verifier.get(), hostname, port, server_config, chain->certs,
                   signature, true);
 
-  RunVerification(verifier.get(), "foo.com", server_config, chain->certs,
+  RunVerification(verifier.get(), "foo.com", port, server_config, chain->certs,
                   signature, false);
 
-  RunVerification(verifier.get(), server_config.substr(1, string::npos),
+  RunVerification(verifier.get(), server_config.substr(1, string::npos), port,
                   server_config, chain->certs, signature, false);
 
   const string corrupt_signature = "1" + signature;
-  RunVerification(verifier.get(), hostname, server_config, chain->certs,
+  RunVerification(verifier.get(), hostname, port, server_config, chain->certs,
                   corrupt_signature, false);
 
   vector<string> wrong_certs;
   for (size_t i = 1; i < chain->certs.size(); i++) {
     wrong_certs.push_back(chain->certs[i]);
   }
-  RunVerification(verifier.get(), "foo.com", server_config, wrong_certs,
+  RunVerification(verifier.get(), "foo.com", port, server_config, wrong_certs,
                   corrupt_signature, false);
 }
 
@@ -259,6 +261,7 @@ TEST(ProofTest, VerifyRSAKnownAnswerTest) {
 
   const string server_config = "server config bytes";
   const string hostname = "test.example.com";
+  const uint16_t port = 8443;
 
   vector<string> certs(2);
   certs[0] = LoadTestCert("test.example.com.crt");
@@ -277,23 +280,23 @@ TEST(ProofTest, VerifyRSAKnownAnswerTest) {
   for (size_t i = 0; i < signatures.size(); i++) {
     const string& signature = signatures[i];
 
-    RunVerification(verifier.get(), hostname, server_config, certs, signature,
-                    true);
-    RunVerification(verifier.get(), "foo.com", server_config, certs, signature,
-                    false);
-    RunVerification(verifier.get(), hostname,
+    RunVerification(verifier.get(), hostname, port, server_config, certs,
+                    signature, true);
+    RunVerification(verifier.get(), "foo.com", port, server_config, certs,
+                    signature, false);
+    RunVerification(verifier.get(), hostname, port,
                     server_config.substr(1, string::npos), certs, signature,
                     false);
 
     const string corrupt_signature = "1" + signature;
-    RunVerification(verifier.get(), hostname, server_config, certs,
+    RunVerification(verifier.get(), hostname, port, server_config, certs,
                     corrupt_signature, false);
 
     vector<string> wrong_certs;
     for (size_t i = 1; i < certs.size(); i++) {
       wrong_certs.push_back(certs[i]);
     }
-    RunVerification(verifier.get(), hostname, server_config, wrong_certs,
+    RunVerification(verifier.get(), hostname, port, server_config, wrong_certs,
                     signature, false);
   }
 }
@@ -340,6 +343,7 @@ TEST(ProofTest, VerifyECDSAKnownAnswerTest) {
 
   const string server_config = "server config bytes";
   const string hostname = "test.example.com";
+  const uint16_t port = 8443;
 
   vector<string> certs(2);
   certs[0] = LoadTestCert("test_ecc.example.com.crt");
@@ -358,11 +362,11 @@ TEST(ProofTest, VerifyECDSAKnownAnswerTest) {
   for (size_t i = 0; i < signatures.size(); i++) {
     const string& signature = signatures[i];
 
-    RunVerification(verifier.get(), hostname, server_config, certs, signature,
-                    true);
-    RunVerification(verifier.get(), "foo.com", server_config, certs, signature,
-                    false);
-    RunVerification(verifier.get(), hostname,
+    RunVerification(verifier.get(), hostname, port, server_config, certs,
+                    signature, true);
+    RunVerification(verifier.get(), "foo.com", port, server_config, certs,
+                    signature, false);
+    RunVerification(verifier.get(), hostname, port,
                     server_config.substr(1, string::npos), certs, signature,
                     false);
 
@@ -370,19 +374,19 @@ TEST(ProofTest, VerifyECDSAKnownAnswerTest) {
     // signature can still be DER-decoded correctly.
     string corrupt_signature = signature;
     corrupt_signature[corrupt_signature.size() - 1] += 1;
-    RunVerification(verifier.get(), hostname, server_config, certs,
+    RunVerification(verifier.get(), hostname, port, server_config, certs,
                     corrupt_signature, false);
 
     // Prepending a "1" makes the DER invalid.
     const string bad_der_signature1 = "1" + signature;
-    RunVerification(verifier.get(), hostname, server_config, certs,
+    RunVerification(verifier.get(), hostname, port, server_config, certs,
                     bad_der_signature1, false);
 
     vector<string> wrong_certs;
     for (size_t i = 1; i < certs.size(); i++) {
       wrong_certs.push_back(certs[i]);
     }
-    RunVerification(verifier.get(), hostname, server_config, wrong_certs,
+    RunVerification(verifier.get(), hostname, port, server_config, wrong_certs,
                     signature, false);
   }
 }