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

Unified Diff: base/nss_init.cc

Issue 415005: Linux: add next-protocol-negotiation to libssl. (Closed)
Patch Set: Addressing wtc's comments. Created 11 years, 1 month 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
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | net/base/ssl_config_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/nss_init.cc
diff --git a/base/nss_init.cc b/base/nss_init.cc
index 24e3203399feeed760c957ac74385e63ff8098b8..015adae84f1c0f2da569d8f97b07925c565a2e25 100644
--- a/base/nss_init.cc
+++ b/base/nss_init.cc
@@ -115,6 +115,7 @@ class NSSInitSingleton {
NSS_SetDomesticPolicy();
+#if defined(USE_SYSTEM_SSL)
// Use late binding to avoid scary but benign warning
// "Symbol `SSL_ImplementedCiphers' has different size in shared object,
// consider re-linking"
@@ -124,6 +125,9 @@ class NSSInitSingleton {
NOTREACHED() << "Can't get list of supported ciphers";
return;
}
+#else
+#define pSSL_ImplementedCiphers SSL_ImplementedCiphers
+#endif
// Explicitly enable exactly those ciphers with keys of at least 80 bits
for (int i = 0; i < SSL_NumImplementedCiphers; i++) {
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | net/base/ssl_config_service.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698