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

Commit 9e9798b3 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Security: Add @SensitiveData annotation." am: 71eb2258 am: 250337e2 

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

Change-Id: Ic0bcf68b6c9d2ba0754543a574ec3254e01e7d8a
parents e1eb6b55 250337e2

security/keymint/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ aidl_interface { 
            vndk: {

                enabled: true,

            },

            apps_enabled: false,

        },

        rust: {

            enabled: true,

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.security.keymint;

/* @hide */

@VintfStability

@SensitiveData @VintfStability

interface IKeyMintDevice {

  android.hardware.security.keymint.KeyMintHardwareInfo getHardwareInfo();

  void addRngEntropy(in byte[] data);

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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 


package android.hardware.security.keymint;

/* @hide */

@VintfStability

@SensitiveData @VintfStability

interface IKeyMintOperation {

  void updateAad(in byte[] input, in @nullable android.hardware.security.keymint.HardwareAuthToken authToken, in @nullable android.hardware.security.secureclock.TimeStampToken timeStampToken);

  byte[] update(in byte[] input, in @nullable android.hardware.security.keymint.HardwareAuthToken authToken, in @nullable android.hardware.security.secureclock.TimeStampToken timeStampToken);

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

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ import android.hardware.security.secureclock.TimeStampToken; 
 * @hide

 */

@VintfStability

@SensitiveData

interface IKeyMintDevice {

    const int AUTH_TOKEN_MAC_LENGTH = 32;

security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.hardware.security.secureclock.TimeStampToken; 


/** @hide */

@VintfStability

@SensitiveData

interface IKeyMintOperation {

    /**

     * Provides additional authentication data (AAD) to a cryptographic operation begun with