summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 23:28:35 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-27 23:28:35 +0000
commit757f2e2ba0c1fa7100461745bfac865e3da1d976 (patch)
tree5ada8a2ea4122f949104663b3a02c54c3ba31720 /chrome/app
parent017f19b5f1af1702252655b4b52bdcd9ab7a0de2 (diff)
downloadchromium_src-757f2e2ba0c1fa7100461745bfac865e3da1d976.zip
chromium_src-757f2e2ba0c1fa7100461745bfac865e3da1d976.tar.gz
chromium_src-757f2e2ba0c1fa7100461745bfac865e3da1d976.tar.bz2
Report the SSL protocol version in ssl_info.connection_status.
Refactor SSLClientSocketNSS::GetSSLInfo -- the code that sets ssl_info->connection_status is moved to a new UpdateConnectionStatus method, and CheckSecureRenegotiation is subsumed by UpdateConnectionStatus. R=agl,finnur BUG=53659 TEST=none Review URL: http://codereview.chromium.org/4198003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 7a51308..a0a9d15 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6029,6 +6029,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK" desc="Linking 2 sentences in 1 paragraph.">
<ph name="SENTENCE1">$1<ex>Your connection is encrypted.</ex></ph> <ph name="SENTENCE2">$2<ex>However, this page includes resources from other pages whose identity cannot be verified.</ex></ph>
</message>
+ <message name="IDS_PAGE_INFO_SECURITY_TAB_SSL_VERSION" desc="This message gives the version of the SSL protocol used to protect the HTTPS connection.">
+ The connection uses <ph name="SSL_VERSION">$1<ex>TLS 1.0</ex></ph>.
+ </message>
<message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS" desc="This message gives details of the cryptographic primitives used to protect the HTTPS connection.">
The connection is encrypted using <ph name="CIPHER">$1<ex>AES_128</ex></ph>, with <ph name="MAC">$2<ex>SHA1</ex></ph> for message authentication and <ph name="KX">$3<ex>RSA</ex></ph> as the key exchange mechanism.
</message>