diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2015-06-04 19:48:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-04 19:48:29 +0000 |
| commit | 43e77bf6209bd964bd9cc568b5f37b26401956b3 (patch) | |
| tree | 762849d22bfba9b5474f94b7ddc477e201ed39e1 /core/java | |
| parent | 581cc1ee59d01fe4b4a31618ab4aedfa639e42b0 (diff) | |
| parent | 8a07701f3817ad0b76b82cfc464868e8f57e359d (diff) | |
| download | frameworks_base-43e77bf6209bd964bd9cc568b5f37b26401956b3.zip frameworks_base-43e77bf6209bd964bd9cc568b5f37b26401956b3.tar.gz frameworks_base-43e77bf6209bd964bd9cc568b5f37b26401956b3.tar.bz2 | |
Merge "Add optional additional entropy to finish" into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/security/IKeystoreService.aidl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/security/IKeystoreService.aidl b/core/java/android/security/IKeystoreService.aidl index 2097d5a..409542d 100644 --- a/core/java/android/security/IKeystoreService.aidl +++ b/core/java/android/security/IKeystoreService.aidl @@ -67,7 +67,8 @@ interface IKeystoreService { OperationResult begin(IBinder appToken, String alias, int purpose, boolean pruneable, in KeymasterArguments params, in byte[] entropy); OperationResult update(IBinder token, in KeymasterArguments params, in byte[] input); - OperationResult finish(IBinder token, in KeymasterArguments params, in byte[] signature); + OperationResult finish(IBinder token, in KeymasterArguments params, in byte[] signature, + in byte[] entropy); int abort(IBinder handle); boolean isOperationAuthorized(IBinder token); int addAuthToken(in byte[] authToken); |