Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived | 5 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived |
| 6 // from AuthCertificateCallback() in | 6 // from AuthCertificateCallback() in |
| 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. | 7 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp. |
| 8 | 8 |
| 9 /* ***** BEGIN LICENSE BLOCK ***** | 9 /* ***** BEGIN LICENSE BLOCK ***** |
| 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 10 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
| (...skipping 1886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1897 } | 1897 } |
| 1898 // Done! | 1898 // Done! |
| 1899 } else { | 1899 } else { |
| 1900 PRErrorCode prerr = PR_GetError(); | 1900 PRErrorCode prerr = PR_GetError(); |
| 1901 net_error = HandleNSSError(prerr, true); | 1901 net_error = HandleNSSError(prerr, true); |
| 1902 | 1902 |
| 1903 // Some network devices that inspect application-layer packets seem to | 1903 // Some network devices that inspect application-layer packets seem to |
| 1904 // inject TCP reset packets to break the connections when they see | 1904 // inject TCP reset packets to break the connections when they see |
| 1905 // TLS 1.1 in ClientHello or ServerHello. See http://crbug.com/130293. | 1905 // TLS 1.1 in ClientHello or ServerHello. See http://crbug.com/130293. |
| 1906 // | 1906 // |
| 1907 // Only allow ERR_CONNECTION_RESET to trigger a TLS 1.1 -> TLS 1.0 | 1907 // Only allow ERR_CONNECTION_RESET/ABORTED to trigger a TLS 1.1 -> TLS 1.0 |
| 1908 // fallback. We don't lose much in this fallback because the explicit | 1908 // fallback. We don't lose much in this fallback because the explicit IV |
| 1909 // IV for CBC mode in TLS 1.1 is approximated by record splitting in | 1909 // for CBC mode in TLS 1.1 is approximated by record splitting in TLS 1.0. |
| 1910 // TLS 1.0. | |
| 1911 // | 1910 // |
| 1912 // ERR_CONNECTION_RESET is a common network error, so we don't want it | 1911 // ERR_CONNECTION_RESET/ABORTED are common network errors, so we don't want |
| 1913 // to trigger a version fallback in general, especially the TLS 1.0 -> | 1912 // them to trigger a version fallback in general, especially the TLS 1.0 -> |
| 1914 // SSL 3.0 fallback, which would drop TLS extensions. | 1913 // SSL 3.0 fallback, which would drop TLS extensions. |
| 1915 if (prerr == PR_CONNECT_RESET_ERROR && | 1914 // |
| 1915 // ERR_CONNECTION_ABORTED was added because we sometimes get it instead of | |
| 1916 // RESET on Windows. See crbug.com/178672. | |
|
wtc
2013/03/04 23:51:27
I found one change to tcp_client_socket_win.cc in
wtc
2013/03/05 18:27:10
We can replace "sometimes" with something like "if
agl
2013/03/05 18:48:20
Done.
| |
| 1917 if ((prerr == PR_CONNECT_RESET_ERROR || | |
| 1918 prerr == PR_CONNECT_ABORTED_ERROR) && | |
|
wtc
2013/03/04 20:55:49
Perhaps only allow PR_CONNECT_ABORTED_ERROR for OS
agl
2013/03/04 21:01:13
I would tend not to have different behaviours on d
| |
| 1916 ssl_config_.version_max == SSL_PROTOCOL_VERSION_TLS1_1) { | 1919 ssl_config_.version_max == SSL_PROTOCOL_VERSION_TLS1_1) { |
| 1917 net_error = ERR_SSL_PROTOCOL_ERROR; | 1920 net_error = ERR_SSL_PROTOCOL_ERROR; |
| 1918 } | 1921 } |
| 1919 | 1922 |
| 1920 // If not done, stay in this state | 1923 // If not done, stay in this state |
| 1921 if (net_error == ERR_IO_PENDING) { | 1924 if (net_error == ERR_IO_PENDING) { |
| 1922 GotoState(STATE_HANDSHAKE); | 1925 GotoState(STATE_HANDSHAKE); |
| 1923 } else { | 1926 } else { |
| 1924 PostOrRunCallback( | 1927 PostOrRunCallback( |
| 1925 FROM_HERE, | 1928 FROM_HERE, |
| (...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3530 EnsureThreadIdAssigned(); | 3533 EnsureThreadIdAssigned(); |
| 3531 base::AutoLock auto_lock(lock_); | 3534 base::AutoLock auto_lock(lock_); |
| 3532 return valid_thread_id_ == base::PlatformThread::CurrentId(); | 3535 return valid_thread_id_ == base::PlatformThread::CurrentId(); |
| 3533 } | 3536 } |
| 3534 | 3537 |
| 3535 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { | 3538 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const { |
| 3536 return server_bound_cert_service_; | 3539 return server_bound_cert_service_; |
| 3537 } | 3540 } |
| 3538 | 3541 |
| 3539 } // namespace net | 3542 } // namespace net |
| OLD | NEW |