Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: net/socket/nss_ssl_util.cc

Issue 757033004: Do not use HTTP/2 without adequate security. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move logic to SSLClientSocket. Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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]));
+ }
}
}
@@ -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.

Powered by Google App Engine
This is Rietveld 408576698