| 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 2859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2870 | 2870 |
| 2871 SSL_ClearSessionCache(); | 2871 SSL_ClearSessionCache(); |
| 2872 } | 2872 } |
| 2873 | 2873 |
| 2874 #if !defined(CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256) | 2874 #if !defined(CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256) |
| 2875 #define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24) | 2875 #define CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256 (CKM_NSS + 24) |
| 2876 #endif | 2876 #endif |
| 2877 | 2877 |
| 2878 // static | 2878 // static |
| 2879 uint16 SSLClientSocket::GetMaxSupportedSSLVersion() { | 2879 uint16 SSLClientSocket::GetMaxSupportedSSLVersion() { |
| 2880 crypto::EnsureNSSInit(); |
| 2880 if (PK11_TokenExists(CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256)) { | 2881 if (PK11_TokenExists(CKM_NSS_TLS_MASTER_KEY_DERIVE_DH_SHA256)) { |
| 2881 return SSL_PROTOCOL_VERSION_TLS1_2; | 2882 return SSL_PROTOCOL_VERSION_TLS1_2; |
| 2882 } else { | 2883 } else { |
| 2883 return SSL_PROTOCOL_VERSION_TLS1_1; | 2884 return SSL_PROTOCOL_VERSION_TLS1_1; |
| 2884 } | 2885 } |
| 2885 } | 2886 } |
| 2886 | 2887 |
| 2887 bool SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { | 2888 bool SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) { |
| 2888 EnterFunction(""); | 2889 EnterFunction(""); |
| 2889 ssl_info->Reset(); | 2890 ssl_info->Reset(); |
| (...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3634 scoped_refptr<X509Certificate> | 3635 scoped_refptr<X509Certificate> |
| 3635 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { | 3636 SSLClientSocketNSS::GetUnverifiedServerCertificateChain() const { |
| 3636 return core_->state().server_cert.get(); | 3637 return core_->state().server_cert.get(); |
| 3637 } | 3638 } |
| 3638 | 3639 |
| 3639 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { | 3640 ChannelIDService* SSLClientSocketNSS::GetChannelIDService() const { |
| 3640 return channel_id_service_; | 3641 return channel_id_service_; |
| 3641 } | 3642 } |
| 3642 | 3643 |
| 3643 } // namespace net | 3644 } // namespace net |
| OLD | NEW |