summaryrefslogtreecommitdiffstats
path: root/net/base/ssl_client_socket_nss.h
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:49:48 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 19:49:48 +0000
commit78e8c3d710650acb48fd241a826d86ad22941c66 (patch)
tree49e63fb3431b9d225479c02c2e4335df0fbd43b7 /net/base/ssl_client_socket_nss.h
parent9cf11c6589e6e24df310bf634155d90afd4def56 (diff)
downloadchromium_src-78e8c3d710650acb48fd241a826d86ad22941c66.zip
chromium_src-78e8c3d710650acb48fd241a826d86ad22941c66.tar.gz
chromium_src-78e8c3d710650acb48fd241a826d86ad22941c66.tar.bz2
For http://code.google.com/p/chromium/issues/detail?id=4510
Extract some UI SSL test code into new class SSLTestUtil to avoid duplication. Point nss at root certs so test_shell can talk to mail.google.com without warnings. Support ciphers needed to talk to testserver.py. Load temporary testing cert needed to run unit tests. Implement part of GetSSLInfo. Change URL in developer error message to point to chromium.org. Re-enable url_request_unittest.cc, which seems to have been disabled by mistake. Later changesets will implement x509 certificates for nss, finish GetSSLInfo support, and update chrome/browser/ssl_uitest.cc to use SSLTestUtil. Earlier version was committed as r6063, but was rolled back. Review URL: http://codereview.chromium.org/11249 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_client_socket_nss.h')
-rw-r--r--net/base/ssl_client_socket_nss.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/base/ssl_client_socket_nss.h b/net/base/ssl_client_socket_nss.h
index 41098f3..5015e1e 100644
--- a/net/base/ssl_client_socket_nss.h
+++ b/net/base/ssl_client_socket_nss.h
@@ -76,6 +76,8 @@ class SSLClientSocketNSS : public SSLClientSocket {
char* user_buf_;
int user_buf_len_;
+ int server_cert_status_;
+
bool completed_handshake_;
enum State {