net/cert/cert_verify_proc.cc - 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: net/cert/cert_verify_proc.cc

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: net/cert/cert_verify_proc.cc

diff --git a/net/cert/cert_verify_proc.cc b/net/cert/cert_verify_proc.cc

index 04f330ff88f969e4f1cb3ee4c62c18cb62fd73cd..8ee406975242f3deff7f826e0db969cc9c36d119 100644

--- a/net/cert/cert_verify_proc.cc

+++ b/net/cert/cert_verify_proc.cc

@@ -20,7 +20,7 @@

#if defined(USE_NSS) || defined(OS_IOS)

#include "net/cert/cert_verify_proc_nss.h"

-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)

+#elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)

#include "net/cert/cert_verify_proc_openssl.h"

#elif defined(OS_ANDROID)

#include "net/cert/cert_verify_proc_android.h"

@@ -167,7 +167,7 @@ bool ExaminePublicKeys(const scoped_refptr<X509Certificate>& cert,

CertVerifyProc* CertVerifyProc::CreateDefault() {

#if defined(USE_NSS) || defined(OS_IOS)

return new CertVerifyProcNSS();

-#elif defined(USE_OPENSSL) && !defined(OS_ANDROID)

+#elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)

return new CertVerifyProcOpenSSL();

#elif defined(OS_ANDROID)

return new CertVerifyProcAndroid();

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