From 61eadb7ce45a3f0236dfe108dfab0a1ca3cc66b2 Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Wed, 17 Mar 2021 10:55:10 -0700 Subject: [PATCH] Security: Provide generated java sources. Enable generation of java sources for AIDL interfaces. This allows enabling the @SensitiveData annotation without causing circular build dependencies. Also mark doc comments as @hide to prevent the interface from being included in the SDK. Bug: 174857732 Test: N/A Merged-In: If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379 Change-Id: If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379 --- security/keymint/aidl/Android.bp | 3 ++- .../hardware/security/keymint/Algorithm.aidl | 1 + .../security/keymint/AttestationKey.aidl | 1 + .../hardware/security/keymint/BeginResult.aidl | 1 + .../hardware/security/keymint/BlockMode.aidl | 1 + .../hardware/security/keymint/Certificate.aidl | 1 + .../hardware/security/keymint/Digest.aidl | 1 + .../hardware/security/keymint/EcCurve.aidl | 1 + .../hardware/security/keymint/ErrorCode.aidl | 1 + .../security/keymint/HardwareAuthToken.aidl | 1 + .../keymint/HardwareAuthenticatorType.aidl | 1 + .../security/keymint/IKeyMintDevice.aidl | 1 + .../security/keymint/IKeyMintOperation.aidl | 1 + .../keymint/IRemotelyProvisionedComponent.aidl | 1 + .../security/keymint/KeyCharacteristics.aidl | 1 + .../security/keymint/KeyCreationResult.aidl | 1 + .../hardware/security/keymint/KeyFormat.aidl | 1 + .../security/keymint/KeyMintHardwareInfo.aidl | 1 + .../hardware/security/keymint/KeyOrigin.aidl | 1 + .../hardware/security/keymint/KeyParameter.aidl | 1 + .../security/keymint/KeyParameterValue.aidl | 1 + .../hardware/security/keymint/KeyPurpose.aidl | 1 + .../security/keymint/MacedPublicKey.aidl | 1 + .../hardware/security/keymint/PaddingMode.aidl | 1 + .../hardware/security/keymint/ProtectedData.aidl | 1 + .../hardware/security/keymint/SecurityLevel.aidl | 1 + .../android/hardware/security/keymint/Tag.aidl | 1 + .../hardware/security/keymint/TagType.aidl | 1 + .../hardware/security/keymint/Algorithm.aidl | 1 + .../security/keymint/AttestationKey.aidl | 1 + .../hardware/security/keymint/BeginResult.aidl | 1 + .../hardware/security/keymint/BlockMode.aidl | 1 + .../hardware/security/keymint/Certificate.aidl | 1 + .../hardware/security/keymint/Digest.aidl | 1 + .../hardware/security/keymint/EcCurve.aidl | 1 + .../hardware/security/keymint/ErrorCode.aidl | 1 + .../security/keymint/HardwareAuthToken.aidl | 1 + .../keymint/HardwareAuthenticatorType.aidl | 1 + .../security/keymint/IKeyMintDevice.aidl | 1 + .../security/keymint/IKeyMintOperation.aidl | 1 + .../keymint/IRemotelyProvisionedComponent.aidl | 1 + .../security/keymint/KeyCharacteristics.aidl | 1 + .../security/keymint/KeyCreationResult.aidl | 1 + .../hardware/security/keymint/KeyFormat.aidl | 1 + .../security/keymint/KeyMintHardwareInfo.aidl | 1 + .../hardware/security/keymint/KeyOrigin.aidl | 1 + .../hardware/security/keymint/KeyParameter.aidl | 1 + .../security/keymint/KeyParameterValue.aidl | 4 ++-- .../hardware/security/keymint/KeyPurpose.aidl | 1 + .../security/keymint/MacedPublicKey.aidl | 1 + .../hardware/security/keymint/PaddingMode.aidl | 1 + .../hardware/security/keymint/ProtectedData.aidl | 1 + .../hardware/security/keymint/SecurityLevel.aidl | 1 + .../android/hardware/security/keymint/Tag.aidl | 1 + .../hardware/security/keymint/TagType.aidl | 1 + security/secureclock/aidl/Android.bp | 3 ++- .../security/secureclock/ISecureClock.aidl | 4 +++- .../security/secureclock/TimeStampToken.aidl | 4 +++- .../hardware/security/secureclock/Timestamp.aidl | 4 +++- .../security/secureclock/ISecureClock.aidl | 2 +- .../security/secureclock/TimeStampToken.aidl | 2 +- .../hardware/security/secureclock/Timestamp.aidl | 1 + .../security/sharedsecret/ISharedSecret.aidl | 15 +++++++++++++++ .../sharedsecret/SharedSecretParameters.aidl | 16 ++++++++++++++++ .../security/sharedsecret/ISharedSecret.aidl | 2 +- .../sharedsecret/SharedSecretParameters.aidl | 2 +- 66 files changed, 104 insertions(+), 11 deletions(-) diff --git a/security/keymint/aidl/Android.bp b/security/keymint/aidl/Android.bp index 54cb4b8ebb..6766d99311 100644 --- a/security/keymint/aidl/Android.bp +++ b/security/keymint/aidl/Android.bp @@ -19,7 +19,8 @@ aidl_interface { stability: "vintf", backend: { java: { - sdk_version: "module_current", + platform_apis: true, + srcs_available: true, }, ndk: { vndk: { diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Algorithm.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Algorithm.aidl index 5adbdc10ca..6da124f601 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Algorithm.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Algorithm.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum Algorithm { RSA = 1, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/AttestationKey.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/AttestationKey.aidl index 21721bfa39..90f2e6ee54 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/AttestationKey.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/AttestationKey.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable AttestationKey { byte[] keyBlob; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BeginResult.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BeginResult.aidl index d9d9c13e3b..c952a3152a 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BeginResult.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BeginResult.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability parcelable BeginResult { long challenge; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BlockMode.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BlockMode.aidl index feba9d0ca3..004988326b 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BlockMode.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BlockMode.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum BlockMode { ECB = 1, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Certificate.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Certificate.aidl index 470d53405c..645f0a72ee 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Certificate.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Certificate.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability parcelable Certificate { byte[] encodedCertificate; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Digest.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Digest.aidl index 5a15aad765..0df709609f 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Digest.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Digest.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum Digest { NONE = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/EcCurve.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/EcCurve.aidl index d7ec0068f6..6b4a9aefb2 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/EcCurve.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/EcCurve.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum EcCurve { P_224 = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ErrorCode.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ErrorCode.aidl index 91e289950b..69ec4cefbb 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ErrorCode.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ErrorCode.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum ErrorCode { OK = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthToken.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthToken.aidl index 3205a461af..2e07924382 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthToken.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthToken.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable HardwareAuthToken { long challenge; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthenticatorType.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthenticatorType.aidl index 926f2ecd52..dfc98f0066 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthenticatorType.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthenticatorType.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum HardwareAuthenticatorType { NONE = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl index bb186694ce..195590c2f3 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability interface IKeyMintDevice { android.hardware.security.keymint.KeyMintHardwareInfo getHardwareInfo(); diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintOperation.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintOperation.aidl index 28a83da0fa..5ac2b4a139 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintOperation.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintOperation.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability interface IKeyMintOperation { void updateAad(in byte[] input, in @nullable android.hardware.security.keymint.HardwareAuthToken authToken, in @nullable android.hardware.security.secureclock.TimeStampToken timeStampToken); diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl index 8387ecc9dd..63bad2c0b7 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability interface IRemotelyProvisionedComponent { byte[] generateEcdsaP256KeyPair(in boolean testMode, out android.hardware.security.keymint.MacedPublicKey macedPublicKey); diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCharacteristics.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCharacteristics.aidl index 91ac7be061..008381f282 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCharacteristics.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCharacteristics.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability parcelable KeyCharacteristics { android.hardware.security.keymint.SecurityLevel securityLevel = android.hardware.security.keymint.SecurityLevel.SOFTWARE; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCreationResult.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCreationResult.aidl index b85203fd2f..9f77d3e3d5 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCreationResult.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCreationResult.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability parcelable KeyCreationResult { byte[] keyBlob; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyFormat.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyFormat.aidl index 4500288542..9560d8d2b5 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyFormat.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyFormat.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum KeyFormat { X509 = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyMintHardwareInfo.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyMintHardwareInfo.aidl index d959ac4536..2113e42a8e 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyMintHardwareInfo.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyMintHardwareInfo.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable KeyMintHardwareInfo { int versionNumber; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyOrigin.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyOrigin.aidl index 2b65567d8f..4b3c659ffe 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyOrigin.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyOrigin.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum KeyOrigin { GENERATED = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameter.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameter.aidl index ee8abda648..c5a1e011d2 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameter.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameter.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable KeyParameter { android.hardware.security.keymint.Tag tag = android.hardware.security.keymint.Tag.INVALID; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameterValue.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameterValue.aidl index fc57cd22e3..7a0b074fe5 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameterValue.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameterValue.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability union KeyParameterValue { int invalid; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyPurpose.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyPurpose.aidl index f891de6c8e..b84bec1fc0 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyPurpose.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyPurpose.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum KeyPurpose { ENCRYPT = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/MacedPublicKey.aidl index 30b38e1f01..8095e8ce04 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/MacedPublicKey.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/MacedPublicKey.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability parcelable MacedPublicKey { byte[] macedKey; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/PaddingMode.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/PaddingMode.aidl index bfb6ea1e98..dba4a8a06e 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/PaddingMode.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/PaddingMode.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum PaddingMode { NONE = 1, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ProtectedData.aidl index 64cce78bd5..d1610b4d6f 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ProtectedData.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ProtectedData.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @VintfStability parcelable ProtectedData { byte[] protectedData; diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/SecurityLevel.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/SecurityLevel.aidl index 628476d7e8..0d278e0af9 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/SecurityLevel.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/SecurityLevel.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum SecurityLevel { SOFTWARE = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl index ccb040437f..7591318289 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum Tag { INVALID = 0, diff --git a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/TagType.aidl b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/TagType.aidl index 58f8bd3278..a7d1de5fd4 100644 --- a/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/TagType.aidl +++ b/security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/TagType.aidl @@ -32,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.keymint; +/* @hide */ @Backing(type="int") @VintfStability enum TagType { INVALID = 0, diff --git a/security/keymint/aidl/android/hardware/security/keymint/Algorithm.aidl b/security/keymint/aidl/android/hardware/security/keymint/Algorithm.aidl index 8300b0d75c..18208939eb 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/Algorithm.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/Algorithm.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * Algorithms provided by IKeyMintDevice implementations. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/AttestationKey.aidl b/security/keymint/aidl/android/hardware/security/keymint/AttestationKey.aidl index 8167cebacd..b4bc60c05b 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/AttestationKey.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/AttestationKey.aidl @@ -22,6 +22,7 @@ import android.hardware.security.keymint.KeyParameter; * Contains a key blob with Tag::ATTEST_KEY that can be used to sign an attestation certificate, * and the DER-encoded X.501 Subject Name that will be placed in the Issuer field of the attestation * certificate. + * @hide */ @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) diff --git a/security/keymint/aidl/android/hardware/security/keymint/BeginResult.aidl b/security/keymint/aidl/android/hardware/security/keymint/BeginResult.aidl index aaf9f3caa4..2304a580a5 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/BeginResult.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/BeginResult.aidl @@ -21,6 +21,7 @@ import android.hardware.security.keymint.KeyParameter; /** * This is all the results returned by the IKeyMintDevice begin() function. + * @hide */ @VintfStability parcelable BeginResult { diff --git a/security/keymint/aidl/android/hardware/security/keymint/BlockMode.aidl b/security/keymint/aidl/android/hardware/security/keymint/BlockMode.aidl index 629c89f02e..749da81aa8 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/BlockMode.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/BlockMode.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * Symmetric block cipher modes provided by IKeyMintDevice implementations. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/Certificate.aidl b/security/keymint/aidl/android/hardware/security/keymint/Certificate.aidl index 0e5d898804..21dfdd554c 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/Certificate.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/Certificate.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * This encodes an IKeyMintDevice certificate, generated for a KeyMint asymmetric public key. + * @hide */ @VintfStability parcelable Certificate { diff --git a/security/keymint/aidl/android/hardware/security/keymint/Digest.aidl b/security/keymint/aidl/android/hardware/security/keymint/Digest.aidl index b44da5a51c..a8768c3ec9 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/Digest.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/Digest.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * Digests provided by keyMint implementations. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/EcCurve.aidl b/security/keymint/aidl/android/hardware/security/keymint/EcCurve.aidl index b9d16467b0..5b1c10c2c5 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/EcCurve.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/EcCurve.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * Supported EC curves, used in ECDSA + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/ErrorCode.aidl b/security/keymint/aidl/android/hardware/security/keymint/ErrorCode.aidl index 95b38f2958..0e2c5f29c8 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/ErrorCode.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/ErrorCode.aidl @@ -19,6 +19,7 @@ package android.hardware.security.keymint; /** * KeyMint error codes. Aidl will return these error codes as service specific * errors in EX_SERVICE_SPECIFIC. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthToken.aidl b/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthToken.aidl index 57150d5da6..0933bd560b 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthToken.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthToken.aidl @@ -27,6 +27,7 @@ import android.hardware.security.secureclock.Timestamp; * passed to begin(), update(), and finish() to prove that authentication occurred. See those * methods for more details. It is up to the caller to determine which of the generated auth tokens * is appropriate for a given key operation. + * @hide */ @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) diff --git a/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthenticatorType.aidl b/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthenticatorType.aidl index 33f71b8d3c..2d9d0ff86a 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthenticatorType.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/HardwareAuthenticatorType.aidl @@ -20,6 +20,7 @@ package android.hardware.security.keymint; * Hardware authentication type, used by HardwareAuthTokens to specify the mechanism used to * authentiate the user, and in KeyCharacteristics to specify the allowable mechanisms for * authenticating to activate a key. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl index 384416e692..3100b23f89 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl @@ -211,6 +211,7 @@ import android.hardware.security.secureclock.TimeStampToken; * hardwareEnforced authorization list. Tag::OS_VERSION, Tag::OS_PATCHLEVEL, * Tag::VENDOR_PATCHLEVEL, and Tag::BOOT_PATCHLEVEL must be cryptographically bound to every * IKeyMintDevice key, as described in the Key Access Control section above. + * @hide */ @VintfStability interface IKeyMintDevice { diff --git a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl index 1c2511b34e..5ad54cda19 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl @@ -20,6 +20,7 @@ import android.hardware.security.keymint.HardwareAuthToken; import android.hardware.security.keymint.KeyParameter; import android.hardware.security.secureclock.TimeStampToken; +/** @hide */ @VintfStability interface IKeyMintOperation { /** diff --git a/security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl b/security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl index 327e4a1e5d..5c8ca6d875 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl @@ -109,6 +109,7 @@ import android.hardware.security.keymint.ProtectedData; * The IRemotelyProvisionedComponent supports a test mode, allowing the generation of test key pairs * and test CertificateRequests. Test keys/requests are annotated as such, and the BCC used for test * CertificateRequests must contain freshly-generated keys, not the real BCC key pairs. + * @hide */ @VintfStability interface IRemotelyProvisionedComponent { diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl index 3a32e4d224..25fdee3d75 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl @@ -28,6 +28,7 @@ import android.hardware.security.keymint.SecurityLevel; * enforced. Note that enforcement at a given security level means that the semantics of the tag * and value are fully enforced. See the definition of individual tags for specifications of what * must be enforced. + * @hide */ @VintfStability parcelable KeyCharacteristics { diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyCreationResult.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyCreationResult.aidl index 69bec2d79f..c589ca14d4 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyCreationResult.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyCreationResult.aidl @@ -22,6 +22,7 @@ import android.hardware.security.keymint.KeyCharacteristics; /** * This structure is returned when a new key is created with generateKey(), importKey() or * importWrappedKey(). + * @hide */ @VintfStability parcelable KeyCreationResult { diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyFormat.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyFormat.aidl index 6ad8e3d922..da3d52122c 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyFormat.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyFormat.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * Formats for key import and export. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyMintHardwareInfo.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyMintHardwareInfo.aidl index ae0d152f16..8da75784de 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyMintHardwareInfo.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyMintHardwareInfo.aidl @@ -20,6 +20,7 @@ import android.hardware.security.keymint.SecurityLevel; /** * KeyMintHardwareInfo is the hardware information returned by calling KeyMint getHardwareInfo() + * @hide */ @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyOrigin.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyOrigin.aidl index 0cd53c2fbb..f89612593b 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyOrigin.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyOrigin.aidl @@ -21,6 +21,7 @@ package android.hardware.security.keymint; * either the hardware-enforced or software-enforced list for a key, indicating whether the key is * hardware or software-based. Specifically, a key with GENERATED in the hardware-enforced list * must be guaranteed never to have existed outide the secure hardware. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyParameter.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyParameter.aidl index bf6c9b204d..b69e6787e7 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyParameter.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyParameter.aidl @@ -22,6 +22,7 @@ import android.hardware.security.keymint.Tag; /** * Identifies the key authorization parameters to be used with keyMint. This is usually * provided as an array of KeyParameters to IKeyMintDevice or Operation. + * @hide */ @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyParameterValue.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyParameterValue.aidl index a4f5154e62..59016f2c3b 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyParameterValue.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyParameterValue.aidl @@ -26,10 +26,10 @@ import android.hardware.security.keymint.KeyPurpose; import android.hardware.security.keymint.PaddingMode; import android.hardware.security.keymint.SecurityLevel; +/** @hide */ @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) union KeyParameterValue { - /* Represents an invalid value type. */ int invalid; @@ -45,7 +45,7 @@ union KeyParameterValue { SecurityLevel securityLevel; /* Other types */ - boolean boolValue; // Always true, if present. + boolean boolValue; // Always true, if present. int integer; long longInteger; long dateTime; diff --git a/security/keymint/aidl/android/hardware/security/keymint/KeyPurpose.aidl b/security/keymint/aidl/android/hardware/security/keymint/KeyPurpose.aidl index 978a02723c..c874fc3a07 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/KeyPurpose.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/KeyPurpose.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * Possible purposes of a key (or pair). + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl b/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl index cb5492dc48..a26094c4b9 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/MacedPublicKey.aidl @@ -19,6 +19,7 @@ package android.hardware.security.keymint; /** * MacedPublicKey contains a CBOR-encoded public key, MACed by an IRemotelyProvisionedComponent, to * prove that the key pair was generated by that component. + * @hide */ @VintfStability parcelable MacedPublicKey { diff --git a/security/keymint/aidl/android/hardware/security/keymint/PaddingMode.aidl b/security/keymint/aidl/android/hardware/security/keymint/PaddingMode.aidl index 80b73bd0dc..fbb373b873 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/PaddingMode.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/PaddingMode.aidl @@ -23,6 +23,7 @@ package android.hardware.security.keymint; * padding modes for both symmetric and asymmetric algorithms. Note that implementations should not * provide all possible combinations of algorithm and padding, only the * cryptographically-appropriate pairs. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl index 438505ebec..44f316fde7 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/ProtectedData.aidl @@ -19,6 +19,7 @@ package android.hardware.security.keymint; /** * ProtectedData contains the encrypted BCC and the ephemeral MAC key used to * authenticate the keysToSign (see keysToSignMac output argument). + * @hide */ @VintfStability parcelable ProtectedData { diff --git a/security/keymint/aidl/android/hardware/security/keymint/SecurityLevel.aidl b/security/keymint/aidl/android/hardware/security/keymint/SecurityLevel.aidl index ecbde8c97c..80c63b2de3 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/SecurityLevel.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/SecurityLevel.aidl @@ -27,6 +27,7 @@ package android.hardware.security.keymint; * certificates. This specifies the security level of the weakest environment involved in * enforcing that particular tag, i.e. the sort of security environment an attacker would have * to subvert in order to break the enforcement of that tag. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl index aa9aa6f1c9..6243bb9b78 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/Tag.aidl @@ -25,6 +25,7 @@ import android.hardware.security.keymint.TagType; /** * Tag specifies various kinds of tags that can be set in KeyParameter to identify what kind of * data are stored in KeyParameter. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/keymint/aidl/android/hardware/security/keymint/TagType.aidl b/security/keymint/aidl/android/hardware/security/keymint/TagType.aidl index a273af3f8c..1ba6ededf2 100644 --- a/security/keymint/aidl/android/hardware/security/keymint/TagType.aidl +++ b/security/keymint/aidl/android/hardware/security/keymint/TagType.aidl @@ -18,6 +18,7 @@ package android.hardware.security.keymint; /** * TagType classifies Tags in Tag.aidl into various groups of data. + * @hide */ @VintfStability @Backing(type="int") diff --git a/security/secureclock/aidl/Android.bp b/security/secureclock/aidl/Android.bp index c8e5c025ff..c78be3b20c 100644 --- a/security/secureclock/aidl/Android.bp +++ b/security/secureclock/aidl/Android.bp @@ -16,7 +16,8 @@ aidl_interface { stability: "vintf", backend: { java: { - sdk_version: "module_current", + platform_apis: true, + srcs_available: true, }, ndk: { vndk: { diff --git a/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/ISecureClock.aidl b/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/ISecureClock.aidl index 377889716a..4ecc1e4430 100644 --- a/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/ISecureClock.aidl +++ b/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/ISecureClock.aidl @@ -11,7 +11,8 @@ * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * limitations under the License. - *//////////////////////////////////////////////////////////////////////////////// + */ +/////////////////////////////////////////////////////////////////////////////// // THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // /////////////////////////////////////////////////////////////////////////////// @@ -30,6 +31,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.secureclock; +/* @hide */ @VintfStability interface ISecureClock { android.hardware.security.secureclock.TimeStampToken generateTimeStamp(in long challenge); diff --git a/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/TimeStampToken.aidl b/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/TimeStampToken.aidl index 00a8bb256d..d105ac8f6c 100644 --- a/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/TimeStampToken.aidl +++ b/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/TimeStampToken.aidl @@ -12,7 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - *//////////////////////////////////////////////////////////////////////////////// + */ +/////////////////////////////////////////////////////////////////////////////// // THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // /////////////////////////////////////////////////////////////////////////////// @@ -31,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.secureclock; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable TimeStampToken { long challenge; diff --git a/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/Timestamp.aidl b/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/Timestamp.aidl index bebeb5cb9c..2e0e389d9e 100644 --- a/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/Timestamp.aidl +++ b/security/secureclock/aidl/aidl_api/android.hardware.security.secureclock/current/android/hardware/security/secureclock/Timestamp.aidl @@ -12,7 +12,8 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - *//////////////////////////////////////////////////////////////////////////////// + */ +/////////////////////////////////////////////////////////////////////////////// // THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // /////////////////////////////////////////////////////////////////////////////// @@ -31,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.secureclock; +/* @hide */ @RustDerive(Clone=true, Eq=true, Hash=true, Ord=true, PartialEq=true, PartialOrd=true) @VintfStability parcelable Timestamp { long milliSeconds; diff --git a/security/secureclock/aidl/android/hardware/security/secureclock/ISecureClock.aidl b/security/secureclock/aidl/android/hardware/security/secureclock/ISecureClock.aidl index 577dd8f231..a742ff0dad 100644 --- a/security/secureclock/aidl/android/hardware/security/secureclock/ISecureClock.aidl +++ b/security/secureclock/aidl/android/hardware/security/secureclock/ISecureClock.aidl @@ -25,8 +25,8 @@ import android.hardware.security.secureclock.TimeStampToken; * secret. The shared secret must be available to secure clock service by implementing * ISharedSecret aidl. Note: ISecureClock depends on the shared secret, without which the secure * time stamp token cannot be generated. + * @hide */ - @VintfStability interface ISecureClock { /** diff --git a/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl b/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl index dd957325e9..71b4278d55 100644 --- a/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl +++ b/security/secureclock/aidl/android/hardware/security/secureclock/TimeStampToken.aidl @@ -20,8 +20,8 @@ import android.hardware.security.secureclock.Timestamp; /** * TimeStampToken instances are used for secure environments that requires secure time information. + * @hide */ - @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) parcelable TimeStampToken { diff --git a/security/secureclock/aidl/android/hardware/security/secureclock/Timestamp.aidl b/security/secureclock/aidl/android/hardware/security/secureclock/Timestamp.aidl index 27758e1d25..5061aa4a7c 100644 --- a/security/secureclock/aidl/android/hardware/security/secureclock/Timestamp.aidl +++ b/security/secureclock/aidl/android/hardware/security/secureclock/Timestamp.aidl @@ -21,6 +21,7 @@ package android.hardware.security.secureclock; * and a secure environment's notion of "current time" must not repeat until the Android device * reboots, or until at least 50 million years have elapsed (note that this requirement is satisfied * by setting the clock to zero during each boot, and then counting time accurately). + * @hide */ @VintfStability @RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true) diff --git a/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/ISharedSecret.aidl b/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/ISharedSecret.aidl index 2509936d99..e76efe7f5d 100644 --- a/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/ISharedSecret.aidl +++ b/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/ISharedSecret.aidl @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * limitations under the License. + */ /////////////////////////////////////////////////////////////////////////////// // THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // /////////////////////////////////////////////////////////////////////////////// @@ -17,6 +31,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.sharedsecret; +/* @hide */ @VintfStability interface ISharedSecret { android.hardware.security.sharedsecret.SharedSecretParameters getSharedSecretParameters(); diff --git a/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/SharedSecretParameters.aidl b/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/SharedSecretParameters.aidl index 9b65046060..b50ddcdad2 100644 --- a/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/SharedSecretParameters.aidl +++ b/security/sharedsecret/aidl/aidl_api/android.hardware.security.sharedsecret/current/android/hardware/security/sharedsecret/SharedSecretParameters.aidl @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /////////////////////////////////////////////////////////////////////////////// // THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. // /////////////////////////////////////////////////////////////////////////////// @@ -17,6 +32,7 @@ // later when a module using the interface is updated, e.g., Mainline modules. package android.hardware.security.sharedsecret; +/* @hide */ @VintfStability parcelable SharedSecretParameters { byte[] seed; diff --git a/security/sharedsecret/aidl/android/hardware/security/sharedsecret/ISharedSecret.aidl b/security/sharedsecret/aidl/android/hardware/security/sharedsecret/ISharedSecret.aidl index 906303f15b..4303dc5c6f 100644 --- a/security/sharedsecret/aidl/android/hardware/security/sharedsecret/ISharedSecret.aidl +++ b/security/sharedsecret/aidl/android/hardware/security/sharedsecret/ISharedSecret.aidl @@ -35,8 +35,8 @@ import android.hardware.security.sharedsecret.SharedSecretParameters; * Step 3: The system collects sharing check hash values from each service and evaluates them. If * they are all equal, then the shared secret generation is considered to be successful else it is * considered to have failed. + * @hide */ - @VintfStability interface ISharedSecret { /** diff --git a/security/sharedsecret/aidl/android/hardware/security/sharedsecret/SharedSecretParameters.aidl b/security/sharedsecret/aidl/android/hardware/security/sharedsecret/SharedSecretParameters.aidl index 691b3f1386..a5eec400f2 100644 --- a/security/sharedsecret/aidl/android/hardware/security/sharedsecret/SharedSecretParameters.aidl +++ b/security/sharedsecret/aidl/android/hardware/security/sharedsecret/SharedSecretParameters.aidl @@ -21,8 +21,8 @@ package android.hardware.security.sharedsecret; * HMAC key between multiple keymint services. These parameters are returned in by * getSharedSecretParameters() and send to computeShareSecret(). See the named methods in * ISharedSecret for details of usage. + * @hide */ - @VintfStability parcelable SharedSecretParameters { /**