net/net.gyp - Issue 12220104: Wire up SSL client authentication for OpenSSL/Android through the net/ stack

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/net.gyp

Issue 12220104: Wire up SSL client authentication for OpenSSL/Android through the net/ stack (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: address nits Created 7 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:

View side-by-side diff with in-line comments

Download patch

« net/base/openssl_private_key_store_android.cc ('K') | « net/data/ssl/scripts/generate-client-certificates.sh ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | net/socket/ssl_client_socket_openssl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/net.gyp

diff --git a/net/net.gyp b/net/net.gyp

index 33c0383de11ab3eb4f6d7aa19b19dc7d3443d40c..911041505bad91176317f36edf2a01cb9440561d 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -241,9 +241,11 @@

'base/nss_cert_database.h',

'base/nss_memio.c',

'base/nss_memio.h',

- 'base/openssl_memory_private_key_store.cc',

+ 'base/openssl_client_key_store.cc',

+ 'base/openssl_client_key_store.h',

'base/openssl_private_key_store.h',

'base/openssl_private_key_store_android.cc',

+ 'base/openssl_private_key_store_memory.cc',

'base/pem_tokenizer.cc',

'base/pem_tokenizer.h',

'base/platform_mime_util.h',

@@ -1100,9 +1102,11 @@

'base/cert_verify_proc_openssl.h',

'base/crypto_module_openssl.cc',

'base/keygen_handler_openssl.cc',

- 'base/openssl_memory_private_key_store.cc',

+ 'base/openssl_client_key_store.cc',

+ 'base/openssl_client_key_store.h',

'base/openssl_private_key_store.h',

'base/openssl_private_key_store_android.cc',

+ 'base/openssl_private_key_store_memory.cc',

'base/test_root_certs_openssl.cc',

'base/x509_certificate_openssl.cc',

'base/x509_util_openssl.cc',

@@ -1269,7 +1273,7 @@

'sources!': [

'base/cert_database_openssl.cc',

'base/cert_verify_proc_openssl.cc',

- 'base/openssl_memory_private_key_store.cc',

+ 'base/openssl_private_key_store_memory.cc',

'base/test_root_certs_openssl.cc',

# The net/android/keystore_openssl.cc source file needs to

@@ -1376,6 +1380,7 @@

'base/net_util_unittest.cc',

'base/network_change_notifier_win_unittest.cc',

'base/nss_cert_database_unittest.cc',

+ 'base/openssl_client_key_store_unittest.cc',

'base/pem_tokenizer_unittest.cc',

'base/prioritized_dispatcher_unittest.cc',

'base/priority_queue_unittest.cc',

@@ -1568,6 +1573,7 @@

'socket/socks5_client_socket_unittest.cc',

'socket/socks_client_socket_pool_unittest.cc',

'socket/socks_client_socket_unittest.cc',

+ 'socket/ssl_client_socket_openssl_unittest.cc',

'socket/ssl_client_socket_pool_unittest.cc',

'socket/ssl_client_socket_unittest.cc',

'socket/ssl_server_socket_unittest.cc',

@@ -1713,7 +1719,9 @@

}, { # else !use_openssl: remove the unneeded files

'sources!': [

+ 'base/openssl_client_key_store_unittest.cc',

'base/x509_util_openssl_unittest.cc',

+ 'socket/ssl_client_socket_openssl_unittest.cc',