diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 18:32:19 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-31 18:32:19 +0000 |
| commit | 81ec7c1ae4386bed9725468d63f18a0e7b6e1241 (patch) | |
| tree | c1157660feeb2e21d12b3849dbdde8af97747d35 /net/socket/ssl_client_socket_nss.cc | |
| parent | 96621a74188115fd95911f2ec2a941cd79e5d8da (diff) | |
| download | chromium_src-81ec7c1ae4386bed9725468d63f18a0e7b6e1241.zip chromium_src-81ec7c1ae4386bed9725468d63f18a0e7b6e1241.tar.gz chromium_src-81ec7c1ae4386bed9725468d63f18a0e7b6e1241.tar.bz2 | |
Add a new GetTlsUniqueChannelBinding method to SSLSocket, and implement nss version.
BUG=139700
Review URL: https://chromiumcodereview.appspot.com/10823084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149231 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_nss.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 9d0eea2..46facf1 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -2824,6 +2824,22 @@ int SSLClientSocketNSS::ExportKeyingMaterial(const base::StringPiece& label, return OK; } +int SSLClientSocketNSS::GetTLSUniqueChannelBinding(std::string* out) { + if (!IsConnected()) + return ERR_SOCKET_NOT_CONNECTED; + unsigned char buf[64]; + unsigned int len; + SECStatus result = SSL_GetChannelBinding(nss_fd_, + SSL_CHANNEL_BINDING_TLS_UNIQUE, + buf, &len, arraysize(buf)); + if (result != SECSuccess) { + LogFailedNSSFunction(net_log_, "SSL_GetChannelBinding", ""); + return MapNSSError(PORT_GetError()); + } + out->assign(reinterpret_cast<char*>(buf), len); + return OK; +} + SSLClientSocket::NextProtoStatus SSLClientSocketNSS::GetNextProto(std::string* proto, std::string* server_protos) { |