content/ppapi_plugin/ppapi_plugin_main.cc - Issue 1222103005: Only initialize NSS in PpapiPluginMain on !USE_OPENSSL builds.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/ppapi_plugin/ppapi_plugin_main.cc

Issue 1222103005: Only initialize NSS in PpapiPluginMain on !USE_OPENSSL builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@init-nss-safely

Patch Set: Created 5 years, 5 months 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: content/ppapi_plugin/ppapi_plugin_main.cc

diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc

index 742a49bdc37ba20f41c5cc931b0ae59545fb7125..b20bdd934ec7c8c252494e409ae833b47dc72f46 100644

--- a/content/ppapi_plugin/ppapi_plugin_main.cc

+++ b/content/ppapi_plugin/ppapi_plugin_main.cc

@@ -115,7 +115,7 @@ int PpapiPluginMain(const MainFunctionParams& parameters) {

base::trace_event::TraceLog::GetInstance()->SetProcessSortIndex(

kTraceEventPpapiProcessSortIndex);

-#if defined(OS_LINUX) && defined(USE_NSS_CERTS)

+#if defined(OS_LINUX) && !defined(USE_OPENSSL)

// Some out-of-process PPAPI plugins use NSS.

// NSS must be initialized before enabling the sandbox below.

crypto::InitNSSSafely();

« no previous file with comments | « no previous file | no next file » | no next file with comments »