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

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

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 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') | net/test/test_certificate_data.h » ('j') | 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 0c586f223eef1363f7886fb36cc6747bf3978568..de76eed17b86df122795316968fc1fb00c69c3b0 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -70,6 +70,8 @@ void GetCiphersList(int cipher, base::ListValue* values) {
values->Append(new base::StringValue("aes256"));
if (cipher & BaseTestServer::SSLOptions::BULK_CIPHER_3DES)
values->Append(new base::StringValue("3des"));
+ if (cipher & BaseTestServer::SSLOptions::BULK_CIPHER_AES128GCM)
+ values->Append(new base::StringValue("aes128gcm"));
}
base::StringValue* GetTLSIntoleranceType(
« no previous file with comments | « net/test/spawned_test_server/base_test_server.h ('k') | net/test/test_certificate_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698