chrome/utility/importer/nss_decryptor.h - Issue 881213004: Support building BoringSSL with NSS certificates.

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: chrome/utility/importer/nss_decryptor.h

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sleevi comments, various build and test fixes Created 5 years, 10 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:

Index: chrome/utility/importer/nss_decryptor.h

diff --git a/chrome/utility/importer/nss_decryptor.h b/chrome/utility/importer/nss_decryptor.h

index d3d309cea7ee6eb48403a55a07653bf4adc66ab8..1f3d8b4c98649e0cff89ce65595a3959b944c398 100644

--- a/chrome/utility/importer/nss_decryptor.h

+++ b/chrome/utility/importer/nss_decryptor.h

@@ -11,13 +11,6 @@

#include "chrome/utility/importer/nss_decryptor_mac.h"

#elif defined(OS_WIN)

#include "chrome/utility/importer/nss_decryptor_win.h"

-#elif defined(USE_OPENSSL)

-// TODO(joth): It should be an error to include this file with USE_OPENSSL

-// defined. (Unless there is a way to do nss decrypt with OpenSSL). Ideally

-// we remove the importers that depend on NSS when doing USE_OPENSSL builds, but

-// that is going to take some non-trivial refactoring so in the meantime we're

-// just falling back to a no-op implementation.

-#include "chrome/utility/importer/nss_decryptor_null.h"

#elif defined(USE_NSS)

#include "chrome/utility/importer/nss_decryptor_system_nss.h"

#endif