Merge "Security: Add @SensitiveData annotation." am: 71eb2258bf

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

Change-Id: I1f39f37e206bad8089f4280396c31a09174dda97
This commit is contained in:
Janis Danisevskis
2021-04-07 22:55:05 +00:00
committed by Automerger Merge Worker
5 changed files with 5 additions and 2 deletions

View File

@@ -26,6 +26,7 @@ aidl_interface {
vndk: {
enabled: true,
},
apps_enabled: false,
},
rust: {
enabled: true,

View File

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

View File

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

View File

@@ -214,6 +214,7 @@ import android.hardware.security.secureclock.TimeStampToken;
* @hide
*/
@VintfStability
@SensitiveData
interface IKeyMintDevice {
const int AUTH_TOKEN_MAC_LENGTH = 32;

View File

@@ -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