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

Commit 5fa64941 authored by Orlando Arbildo's avatar Orlando Arbildo Committed by Gerrit Code Review
Browse files

Merge "Adding HW Crypto operations to IHwCryptoDeviceKeyAccess AIDL definition" into main

parents 2558bf60 5fe91f4d

staging/security/see/hwcrypto/aidl/aidl_api/android.hardware.security.see/current/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ interface IHwCryptoKey { 
  android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceCurrentBoundKeyResult deriveCurrentDicePolicyBoundKey(in android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundDerivationKey derivationKey);

  android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundKeyResult deriveDicePolicyBoundKey(in android.hardware.security.see.hwcrypto.IHwCryptoKey.DiceBoundDerivationKey derivationKey, in byte[] dicePolicyForKeyVersion);

  android.hardware.security.see.hwcrypto.IHwCryptoKey.DerivedKey deriveKey(in android.hardware.security.see.hwcrypto.IHwCryptoKey.DerivedKeyParameters parameters);

  android.hardware.security.see.hwcrypto.IHwCryptoOperations getHwCryptoOperations();

  enum DeviceKeyId {

    DEVICE_BOUND_KEY,

    BATCH_KEY,

staging/security/see/hwcrypto/aidl/android/hardware/security/see/hwcrypto/IHwCryptoKey.aidl

+16 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package android.hardware.security.see.hwcrypto;



import android.hardware.security.see.hwcrypto.IHwCryptoOperations;

import android.hardware.security.see.hwcrypto.IOpaqueKey;

import android.hardware.security.see.hwcrypto.KeyPolicy;
@@ -183,4 +184,19 @@ interface IHwCryptoKey { 
     *      <code>HalErrorCode</code> otherwise.

     */

    DerivedKey deriveKey(in DerivedKeyParameters parameters);



    /*

     * getHwCryptoOperations() - Returns an interface used to work on opaque keys. This interface

     *                           can also be used to operate on any opaque key generated by

     *                           hwkeyDeriveVersioned, even if this key has been generated after

     *                           retrieving a IHwCryptoOperations binder object, as long as the

     *                           parent IHwCryptoDeviceKeyAccess is not dropped between retrieving

     *                           the IHwCryptoOperations binder object and deriving the key.

     *                           IHwCryptoOperations can also be used to create opaque keys that

     *                           are not bound to the device.

     *

     * Return:

     *      IHwCryptoOperations on success

     */

    IHwCryptoOperations getHwCryptoOperations();

}