From a107821af15125d7043ea8dd4d35bc329e9f9ac9 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Thu, 24 May 2012 14:51:10 +0000 Subject: nss: revert encrypted and origin bound certificates support. This change is the result of running patch -R to revert the two patches. A minor change is needed to ssl_client_socket_nss.cc in order for the result to compile. BUG=129174 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138793 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket/ssl_client_socket_nss.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'net/socket') diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index cf15d5e..ed99bbf 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2083,12 +2083,9 @@ SECStatus SSLClientSocketNSS::OwnAuthCertHandler(void* arg, // static bool SSLClientSocketNSS::DomainBoundCertNegotiated(PRFileDesc* socket) { - PRBool xtn_negotiated = PR_FALSE; - SECStatus rv = SSL_HandshakeNegotiatedExtension( - socket, ssl_ob_cert_xtn, &xtn_negotiated); - DCHECK_EQ(SECSuccess, rv); - - return xtn_negotiated ? true : false; + // TODO(wtc,mattm): this is temporary while DBC support is changed into + // Channel ID. + return false; } SECStatus SSLClientSocketNSS::DomainBoundClientAuthHandler( -- cgit v1.1