summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket_mac.cc
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 20:50:19 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-23 20:50:19 +0000
commitce0825e1eff8630e5e0bec6d9204f3682982385d (patch)
tree5d72b8eebac3848b2878fe6ae1d11a76b55e7695 /net/socket/ssl_client_socket_mac.cc
parente70c6a8ce0d7a9e426c7247f5b771bed1b9eae4a (diff)
downloadchromium_src-ce0825e1eff8630e5e0bec6d9204f3682982385d.zip
chromium_src-ce0825e1eff8630e5e0bec6d9204f3682982385d.tar.gz
chromium_src-ce0825e1eff8630e5e0bec6d9204f3682982385d.tar.bz2
Obtain the cipher suite from the Mac Secure Transport and
Windows SChannel. R=agl BUG=49699 TEST=Run Chrome with the --use-system-ssl command-line option on Mac and Windows. Visit an HTTPS site. Click the lock icon on the left of the location bar. The Security Information dialog should display the SSL cipher suite info. Review URL: http://codereview.chromium.org/3042015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_mac.cc')
-rw-r--r--net/socket/ssl_client_socket_mac.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index c3c7d7a..4ee9c23 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -653,8 +653,12 @@ void SSLClientSocketMac::GetSSLInfo(SSLInfo* ssl_info) {
// security info
SSLCipherSuite suite;
OSStatus status = SSLGetNegotiatedCipher(ssl_context_, &suite);
- if (!status)
+ if (!status) {
ssl_info->security_bits = KeySizeOfCipherSuite(suite);
+ ssl_info->connection_status |=
+ (suite & SSL_CONNECTION_CIPHERSUITE_MASK) <<
+ SSL_CONNECTION_CIPHERSUITE_SHIFT;
+ }
if (ssl_config_.ssl3_fallback)
ssl_info->connection_status |= SSL_CONNECTION_SSL3_FALLBACK;