crypto/symmetric_key.h - Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling.

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/symmetric_key.h

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Final fixes and nits Created 6 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/symmetric_key.h

diff --git a/crypto/symmetric_key.h b/crypto/symmetric_key.h

index 1d903f19798f75f6d3e93b970862c360bd2a1557..413f61e0bca4e3c4be1fde391036e3b096ff0d81 100644

--- a/crypto/symmetric_key.h

+++ b/crypto/symmetric_key.h

@@ -14,7 +14,8 @@

// See comments for crypto_nacl_win64 in crypto.gyp.

// Must test for NACL_WIN64 before OS_WIN since former is a subset of latter.

#include "crypto/scoped_capi_types.h"

-#elif defined(USE_NSS) || defined(OS_WIN) || defined(OS_MACOSX)

+#elif defined(USE_NSS) || \

+ (!defined(USE_OPENSSL) && (defined(OS_WIN) || defined(OS_MACOSX)))

#include "crypto/scoped_nss_types.h"

#endif

« no previous file with comments | « crypto/encryptor.h ('k') | net/cert/cert_verify_proc.cc » ('j') | no next file with comments »