diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 00:54:27 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 00:54:27 +0000 |
| commit | 2816e1f32ac606e9d41f687f3fa2f71c247104f3 (patch) | |
| tree | 31aaa750dc826fd75e34aec856b8be19e1b6167c /net/net.gyp | |
| parent | 55d19d36967458d8bfbbf16ef38ce1576f92eb04 (diff) | |
| download | chromium_src-2816e1f32ac606e9d41f687f3fa2f71c247104f3.zip chromium_src-2816e1f32ac606e9d41f687f3fa2f71c247104f3.tar.gz chromium_src-2816e1f32ac606e9d41f687f3fa2f71c247104f3.tar.bz2 | |
Refactoring AndroidKeyStore to support a KeyStore running in another process
This CL does a number of things:
1) Extracts an AndroidKeyStore interface which specifies the API needed by the
native OpenSSL engine from an AndroidKeyStore. Also changes from using
PrivateKey to AndroidPrivateKey to provide a layer of indirection needed for a
remote PrivateKey
2) Renames the previous AndroidKeyStore to AndroidKeyStoreLocalImpl as it's
used for interacting with an in-process Android KeyStore
3) Provides a new class AndroidKeyStoreRemoteImpl and corresponding
IAndroidKeyStoreRemote.aidl that together specify the interface and interaction
with a remote process managing an Android KeyStore
4) Alters the PKCS11-based authentication flow to only use out a remote Android
KeyStore
5) Adds a new method to the previous AndroidKeyStore interface to facilitate
clean up of remote keys
BUG=341500
CONTRIBUTOR=ppi@chromium.org
R=bulach@chromium.org, klobag@chromium.org
TBR=rsleevi
NOTRY=true
Review URL: https://codereview.chromium.org/166143002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 348c134..d8a1d56 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -65,6 +65,8 @@ 'android/cert_verify_status_android_list.h', 'android/gurl_utils.cc', 'android/gurl_utils.h', + 'android/android_private_key.cc', + 'android/android_private_key.h', 'android/keystore.cc', 'android/keystore.h', 'android/keystore_openssl.cc', @@ -3035,6 +3037,7 @@ 'android/java/src/org/chromium/net/AndroidCertVerifyResult.java', 'android/java/src/org/chromium/net/AndroidKeyStore.java', 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', + 'android/java/src/org/chromium/net/AndroidPrivateKey.java', 'android/java/src/org/chromium/net/GURLUtils.java', 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 'android/java/src/org/chromium/net/ProxyChangeListener.java', @@ -3070,10 +3073,25 @@ 'certificate_mime_types_java', 'net_errors_java', 'private_key_types_java', + 'remote_android_keystore_aidl', ], 'includes': [ '../build/java.gypi' ], }, { + # Processes the interface files for communication with an Android KeyStore + # running in a separate process. + 'target_name': 'remote_android_keystore_aidl', + 'type': 'none', + 'variables': { + 'aidl_interface_file': '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreInterface.aidl', + }, + 'sources': [ + '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStore.aidl', + '../net/android/java/src/org/chromium/net/IRemoteAndroidKeyStoreCallbacks.aidl', + ], + 'includes': [ '../build/java_aidl.gypi' ], + }, + { 'target_name': 'net_java_test_support', 'type': 'none', 'variables': { |