Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2644)

Unified Diff: net/test/spawned_test_server/base_test_server.cc

Issue 1223233002: Common Name Mismatch Handler For WWW Subdomain Mismatch case (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mmenke's comments Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/spawned_test_server/base_test_server.cc
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index dddb02dc2abdd4e361722b23fb098b14521a0173..da56a7315a13b202767d9acd768d50d543e8adc5 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "base/base64.h"
+#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
@@ -41,7 +42,6 @@ std::string GetHostname(BaseTestServer::Type type,
return "localhost";
}
}
-
Ryan Sleevi 2015/08/07 00:14:10 Unnecessary change?
// Use the 127.0.0.1 as default.
return BaseTestServer::kLocalhost;
}
@@ -149,6 +149,10 @@ base::FilePath BaseTestServer::SSLOptions::GetCertificateFile() const {
return base::FilePath(FILE_PATH_LITERAL("redundant-server-chain.pem"));
case CERT_AUTO:
return base::FilePath();
+ case CERT_EXAMPLE_DOMAIN:
+ return base::FilePath(FILE_PATH_LITERAL("example_cert.pem"));
+ case CERT_WWW_EXAMPLE_DOMAIN:
+ return base::FilePath(FILE_PATH_LITERAL("www_example_cert.pem"));
default:
NOTREACHED();
}
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698