Merge "Security: Add @SensitiveData annotation."
This commit is contained in:
commit
71eb2258bf
5 changed files with 5 additions and 2 deletions
|
@ -26,6 +26,7 @@ aidl_interface {
|
|||
vndk: {
|
||||
enabled: true,
|
||||
},
|
||||
apps_enabled: false,
|
||||
},
|
||||
rust: {
|
||||
enabled: true,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -214,6 +214,7 @@ import android.hardware.security.secureclock.TimeStampToken;
|
|||
* @hide
|
||||
*/
|
||||
@VintfStability
|
||||
@SensitiveData
|
||||
interface IKeyMintDevice {
|
||||
const int AUTH_TOKEN_MAC_LENGTH = 32;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue