diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 14:51:10 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 14:51:10 +0000 |
| commit | a107821af15125d7043ea8dd4d35bc329e9f9ac9 (patch) | |
| tree | fb81c20348fabc596c7f66ea910df7806bd96cbb /net/socket | |
| parent | c9875dfefb23080a2845485d865933a852aee89d (diff) | |
| download | chromium_src-a107821af15125d7043ea8dd4d35bc329e9f9ac9.zip chromium_src-a107821af15125d7043ea8dd4d35bc329e9f9ac9.tar.gz chromium_src-a107821af15125d7043ea8dd4d35bc329e9f9ac9.tar.bz2 | |
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
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 9 |
1 files changed, 3 insertions, 6 deletions
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( |