| Index: net/test/spawned_test_server/base_test_server.h
|
| diff --git a/net/test/spawned_test_server/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
|
| index 73ac855b6734cb8c7f647853cee7aa97af81e994..a43df110a7c55bf275829f15b22b468ff3a441fc 100644
|
| --- a/net/test/spawned_test_server/base_test_server.h
|
| +++ b/net/test/spawned_test_server/base_test_server.h
|
| @@ -90,16 +90,18 @@ class BaseTestServer {
|
| enum BulkCipher {
|
| // Special value used to indicate that any algorithm the server supports
|
| // is acceptable. Preferred over explicitly OR-ing all ciphers.
|
| - BULK_CIPHER_ANY = 0,
|
| + BULK_CIPHER_ANY = 0,
|
|
|
| - BULK_CIPHER_RC4 = (1 << 0),
|
| + BULK_CIPHER_RC4 = (1 << 0),
|
| BULK_CIPHER_AES128 = (1 << 1),
|
| BULK_CIPHER_AES256 = (1 << 2),
|
|
|
| // NOTE: 3DES support in the Python test server has external
|
| // dependencies and not be available on all machines. Clients may not
|
| // be able to connect if only 3DES is specified.
|
| - BULK_CIPHER_3DES = (1 << 3),
|
| + BULK_CIPHER_3DES = (1 << 3),
|
| +
|
| + BULK_CIPHER_AES128GCM = (1 << 4),
|
| };
|
|
|
| // NOTE: the values of these enumerators are passed to the the Python test
|
|
|