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

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

Issue 257513008: Populate cert_key_types on OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: USE_OPENSSL_CERTS Created 6 years, 8 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.h
diff --git a/net/test/spawned_test_server/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
index 392a72be95d9555bd6fdacf4be9c5edf2d9aed01..c510c0933907b89ac005b5ba396fda78d1c31720 100644
--- a/net/test/spawned_test_server/base_test_server.h
+++ b/net/test/spawned_test_server/base_test_server.h
@@ -13,6 +13,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "net/base/host_port_pair.h"
+#include "net/ssl/ssl_client_cert_type.h"
class GURL;
@@ -101,6 +102,15 @@ class BaseTestServer {
BULK_CIPHER_3DES = (1 << 3),
};
+ enum ClientKeyType {
wtc 2014/04/25 18:52:40 Nit: I suggest naming this type "ClientCertType" b
davidben 2014/04/25 20:52:31 Oops. Removed.
+ // Special value used to indicate the default setting (rsa_sign).
+ CLIENT_KEY_TYPE_DEFAULT = 0,
+
+ CLIENT_KEY_TYPE_RSA_SIGN = (1 << 0),
+ CLIENT_KEY_TYPE_DSS_SIGN = (1 << 1),
+ CLIENT_KEY_TYPE_ECDSA_SIGN = (1 << 2),
+ };
+
// NOTE: the values of these enumerators are passed to the the Python test
// server. Do not change them.
enum TLSIntolerantLevel {
@@ -146,6 +156,11 @@ class BaseTestServer {
// field of the CertificateRequest.
std::vector<base::FilePath> client_authorities;
+ // If |request_client_certificate| is true, an optional list of
+ // SSLClientCertType values to populate the certificate_types field of the
+ // CertificateRequest.
+ std::vector<SSLClientCertType> client_cert_types;
+
// A bitwise-OR of KeyExchnage that should be used by the
// HTTPS server, or KEY_EXCHANGE_ANY to indicate that all implemented
// key exchange algorithms are acceptable.

Powered by Google App Engine
This is Rietveld 408576698