Chromium Code Reviews| Index: net/socket/nss_ssl_util.cc |
| diff --git a/net/socket/nss_ssl_util.cc b/net/socket/nss_ssl_util.cc |
| index a238a25d2d4be95623fead070880556aa2c7aa64..5f3f187ac01c557e45f7ae33a03ac7b9644674c8 100644 |
| --- a/net/socket/nss_ssl_util.cc |
| +++ b/net/socket/nss_ssl_util.cc |
| @@ -135,6 +135,9 @@ class NSSSSLInitSingleton { |
| enabled = true; |
| } |
| SSL_CipherPrefSetDefault(ssl_ciphers[i], enabled); |
| + if (enabled) { |
| + enabled_cipher_suites_.push_back(static_cast<uint16>(ssl_ciphers[i])); |
| + } |
|
Ryan Hamilton
2014/12/10 21:11:41
nit: net style says to not use {}s on 1 line if st
Bence
2014/12/11 16:50:49
This is formatted by git cl format, which does not
|
| } |
| } |
| @@ -205,6 +208,8 @@ class NSSSSLInitSingleton { |
| PR_Close(model_fd_); |
| } |
| + std::vector<uint16> enabled_cipher_suites_; |
| + |
| private: |
| PRFileDesc* model_fd_; |
| }; |
| @@ -231,6 +236,10 @@ PRFileDesc* GetNSSModelSocket() { |
| return g_nss_ssl_init_singleton.Get().GetModelSocket(); |
| } |
| +const std::vector<uint16>& GetNSSEnabledCipherSuites() { |
| + return g_nss_ssl_init_singleton.Get().enabled_cipher_suites_; |
| +} |
| + |
| // Map a Chromium net error code to an NSS error code. |
| // See _MD_unix_map_default_error in the NSS source |
| // tree for inspiration. |