Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 533d164e authored by Chad Brubaker's avatar Chad Brubaker Committed by Android Git Automerger
Browse files

am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish" 

* commit '0189c6ef':
  Add optional additional entropy to finish
parents bd613068 0189c6ef

core/java/android/security/IKeystoreService.aidl

+2 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,8 @@ interface IKeystoreService { 
    OperationResult begin(IBinder appToken, String alias, int purpose, boolean pruneable,

    OperationResult begin(IBinder appToken, String alias, int purpose, boolean pruneable,

        in KeymasterArguments params, in byte[] entropy, out KeymasterArguments operationParams);

        in KeymasterArguments params, in byte[] entropy, out KeymasterArguments operationParams);

    OperationResult update(IBinder token, in KeymasterArguments params, in byte[] input);

    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);

    int abort(IBinder handle);

    boolean isOperationAuthorized(IBinder token);

    boolean isOperationAuthorized(IBinder token);

    int addAuthToken(in byte[] authToken);

    int addAuthToken(in byte[] authToken);

keystore/java/android/security/KeyStore.java

+7 −2
Original line number Original line 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 {

        try {

            return mBinder.finish(token, arguments, signature);

            return mBinder.finish(token, arguments, signature, entropy);

        } catch (RemoteException e) {

        } catch (RemoteException e) {

            Log.w(TAG, "Cannot connect to keystore", e);

            Log.w(TAG, "Cannot connect to keystore", e);

            return null;

            return null;

        }

        }

    }

    }





    public OperationResult finish(IBinder token, KeymasterArguments arguments, byte[] signature) {

        return finish(token, arguments, signature, null);

    }



    public int abort(IBinder token) {

    public int abort(IBinder token) {

        try {

        try {

            return mBinder.abort(token);

            return mBinder.abort(token);