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

Commit ae368b8c authored by Satya Tangirala's avatar Satya Tangirala Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" am:... 

Merge "Keystore 2.0: add convertStorageKeyToEphemeral() to IKeymintDevice" am: 38b3bcee am: d037d2a2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1622545

Change-Id: I7aeba5e9d1d7cd48066677f9ed39c1aea47128fb
parents c732eaff d037d2a2

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ interface IKeyMintDevice { 
  android.hardware.security.keymint.BeginResult begin(in android.hardware.security.keymint.KeyPurpose purpose, in byte[] keyBlob, in android.hardware.security.keymint.KeyParameter[] params, in android.hardware.security.keymint.HardwareAuthToken authToken);

  void deviceLocked(in boolean passwordOnly, in @nullable android.hardware.security.secureclock.TimeStampToken timestampToken);

  void earlyBootEnded();

  byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob);

  byte[] performOperation(in byte[] request);

  const int AUTH_TOKEN_MAC_LENGTH = 32;

}

security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl

+21 −0
Original line number Diff line number Diff line
@@ -762,6 +762,27 @@ interface IKeyMintDevice { 
     */

    void earlyBootEnded();



    /*

     * Called by the client to get a wrapped per-boot ephemeral key from a wrapped storage key.

     * Clients will then use the returned per-boot ephemeral key in place of the wrapped storage

     * key. Whenever the hardware is presented with a per-boot ephemeral key for an operation, it

     * must use the storage key associated with that ephemeral key to perform the requested

     * operation.

     *

     * Implementations should return ErrorCode::UNIMPLEMENTED if they don't support wrapped storage

     * keys.

     *

     * Implementations should return ErrorCode::INVALID_ARGUMENT (as a ServiceSpecificException)

     * if the input key blob doesn't represent a valid long-lived wrapped storage key.

     *

     * @param storageKeyBlob is the wrapped storage key for which the client wants a per-boot

     *        ephemeral key

     *

     * @return a buffer containing the per-boot ephemeral keyblob that should henceforth be used in

     *         place of the input storageKeyBlob

     */

    byte[] convertStorageKeyToEphemeral(in byte[] storageKeyBlob);



    /**

     * Called by the client to perform a KeyMint operation.

     *