crypto/nss_util.cc - Issue 1808963004: Adding macro to enable changing SSL library (Part 1)

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: crypto/nss_util.cc

Issue 1808963004: Adding macro to enable changing SSL library (Part 1) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove remoting_nacl change. Created 4 years, 9 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: crypto/nss_util.cc

diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc

index a7cb9e80002d01b30e930d077845f26e19ce0dfd..5bd6436416c1aeebd461780b64987153c373d4a4 100644

--- a/crypto/nss_util.cc

+++ b/crypto/nss_util.cc

@@ -803,7 +803,6 @@ class NSSInitSingleton {

}

-#if defined(USE_NSS_CERTS) || defined(OS_IOS)

// Load nss's built-in root certs.

SECMODModule* InitDefaultRootCerts() {

SECMODModule* root = LoadModule("Root Certs", "libnssckbi.so", NULL);

@@ -843,7 +842,6 @@ class NSSInitSingleton {

}

return module;

}

-#endif

bool tpm_token_enabled_for_nss_;

bool initializing_tpm_token_;

« no previous file with comments | « build/config/crypto.gni ('k') | ios/chrome/browser/ios_chrome_io_thread.mm » ('j') | no next file with comments »