summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket_nss.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 02:45:39 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-08 02:45:39 +0000
commit61f3ddf4645c33f546e3b80058514966253a4342 (patch)
tree83999385dd746a7c6781879a89f550634d94e656 /net/socket/ssl_client_socket_nss.cc
parentd3ecc939b68dbb3ee922d2fd04d89230c7b62733 (diff)
downloadchromium_src-61f3ddf4645c33f546e3b80058514966253a4342.zip
chromium_src-61f3ddf4645c33f546e3b80058514966253a4342.tar.gz
chromium_src-61f3ddf4645c33f546e3b80058514966253a4342.tar.bz2
Adds support for the credentials frame.
Need to allow spdy sessions to see if the underlying socket is required OBCs. If so, and if pooling a connection, then we need to generate a CREDENTIALS frame for this origin. Need to add support for the RST_FRAME status code of INVALID CREDENTIALS Review URL: http://codereview.chromium.org/9294001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120923 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
-rw-r--r--net/socket/ssl_client_socket_nss.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 6c70615..ba07fa4 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -1633,7 +1633,7 @@ int SSLClientSocketNSS::DoGetOBCertComplete(int result) {
return MapNSSError(PORT_GetError());
GotoState(STATE_HANDSHAKE);
- set_was_origin_bound_cert_sent(true);
+ set_origin_bound_cert_type(ob_cert_type_);
return OK;
}
@@ -2231,7 +2231,7 @@ SECStatus SSLClientSocketNSS::OriginBoundClientAuthHandler(
int result = ImportOBCertAndKey(result_certificate,
result_private_key);
if (result == OK) {
- set_was_origin_bound_cert_sent(true);
+ set_origin_bound_cert_type(ob_cert_type_);
} else {
rv = SECFailure;
}
@@ -2721,4 +2721,8 @@ bool SSLClientSocketNSS::CalledOnValidThread() const {
return valid_thread_id_ == base::PlatformThread::CurrentId();
}
+OriginBoundCertService* SSLClientSocketNSS::GetOriginBoundCertService() const {
+ return origin_bound_cert_service_;
+}
+
} // namespace net