Merge "Add optional additional entropy to finish" into mnc-dev (43e77bf6) · Commits · e / os / android_frameworks_base

core/java/android/security/IKeystoreService.aidl

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);

+7 −2

Original line number	Diff line number	Diff line
		@@ -514,15 +514,20 @@ public class KeyStore {
		}
		}

		public OperationResult finish(IBinder token, KeymasterArguments arguments, byte[] signature) {
		public OperationResult finish(IBinder token, KeymasterArguments arguments, byte[] signature,
		byte[] entropy) {
		try {
		return mBinder.finish(token, arguments, signature);
		return mBinder.finish(token, arguments, signature, entropy);
		} catch (RemoteException e) {
		Log.w(TAG, "Cannot connect to keystore", e);
		return null;
		}
		}

		public OperationResult finish(IBinder token, KeymasterArguments arguments, byte[] signature) {
		return finish(token, arguments, signature, null);
		}

		public int abort(IBinder token) {
		try {
		return mBinder.abort(token);