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

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

Issue 994373004: Properly handle alerts from the peer in SSL_read. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
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 de76eed17b86df122795316968fc1fb00c69c3b0..106ec17e36317853d7cb274942f16976242515c3 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -105,7 +105,8 @@ BaseTestServer::SSLOptions::SSLOptions()
staple_ocsp_response(false),
ocsp_server_unavailable(false),
enable_npn(false),
- disable_session_cache(false) {
+ disable_session_cache(false),
+ alert_after_handshake(false) {
}
BaseTestServer::SSLOptions::SSLOptions(
@@ -123,7 +124,8 @@ BaseTestServer::SSLOptions::SSLOptions(
staple_ocsp_response(false),
ocsp_server_unavailable(false),
enable_npn(false),
- disable_session_cache(false) {
+ disable_session_cache(false),
+ alert_after_handshake(false) {
}
BaseTestServer::SSLOptions::~SSLOptions() {}
@@ -488,6 +490,8 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
arguments->Set("enable-npn", base::Value::CreateNullValue());
if (ssl_options_.disable_session_cache)
arguments->Set("disable-session-cache", base::Value::CreateNullValue());
+ if (ssl_options_.alert_after_handshake)
+ arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
}
return GenerateAdditionalArguments(arguments);

Powered by Google App Engine
This is Rietveld 408576698