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

Commit 963999f2 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Revert "Add remote key provisioning to the IC HAL" am: be321133 am:... 

Revert "Add remote key provisioning to the IC HAL" am: be321133 am: e8700adf am: 77444fe8 am: 60422b97

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

Change-Id: I249c6357955fd5cf9a4add324bd42c15c7bfefe9
parents 63f1055b 60422b97

identity/aidl/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ aidl_interface { 
    ],

    imports: [

        "android.hardware.keymaster",

        "android.hardware.security.keymint",

    ],

    stability: "vintf",

    backend: {
@@ -26,7 +25,6 @@ aidl_interface { 
            vndk: {

                enabled: true,

            },

            apps_enabled: false,

        },

    },

    versions: [

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/HardwareInformation.aidl

+0 −1
Original line number Diff line number Diff line
@@ -39,5 +39,4 @@ parcelable HardwareInformation { 
  int dataChunkSize;

  boolean isDirectAccess;

  @utf8InCpp String[] supportedDocTypes;

  boolean isRemoteKeyProvisioningSupported = false;

}

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/IIdentityCredentialStore.aidl

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ interface IIdentityCredentialStore { 
  android.hardware.identity.IWritableIdentityCredential createCredential(in @utf8InCpp String docType, in boolean testCredential);

  android.hardware.identity.IIdentityCredential getCredential(in android.hardware.identity.CipherSuite cipherSuite, in byte[] credentialData);

  android.hardware.identity.IPresentationSession createPresentationSession(in android.hardware.identity.CipherSuite cipherSuite);

  android.hardware.security.keymint.IRemotelyProvisionedComponent getRemotelyProvisionedComponent();

  const int STATUS_OK = 0;

  const int STATUS_FAILED = 1;

  const int STATUS_CIPHER_SUITE_NOT_SUPPORTED = 2;

identity/aidl/aidl_api/android.hardware.identity/current/android/hardware/identity/IWritableIdentityCredential.aidl

+0 −1
Original line number Diff line number Diff line
@@ -41,5 +41,4 @@ interface IWritableIdentityCredential { 
  byte[] addEntryValue(in byte[] content);

  @SuppressWarnings(value={"out-array"}) void finishAddingEntries(out byte[] credentialData, out byte[] proofOfProvisioningSignature);

  void setExpectedProofOfProvisioningSize(in int expectedProofOfProvisioningSize);

  void setRemotelyProvisionedAttestationKey(in byte[] attestationKeyBlob, in byte[] attestationCertificate);

}

identity/aidl/android/hardware/identity/HardwareInformation.aidl

+0 −15
Original line number Diff line number Diff line
@@ -51,19 +51,4 @@ parcelable HardwareInformation { 
     *

     */

    @utf8InCpp String[] supportedDocTypes;



    /**

     * isRemoteKeyProvisioningSupported indicates whether or not the underlying implementation

     * supports a remotely provisioned key for attestation or not. If this field is false, then

     * the implementation only uses a factory-installed, fixed attestation key. If this field is

     * true, then an IRemotelyProvisionedComponent is associated with the IIdentityCredentialStore,

     * and a remotely provisioned key blob may be provided for credential key attestation.

     *

     * Note that remote provisioning is not required, even when it is supported. Implementations

     * MUST use a factory-installed attestation key as a fallback for when there are no

     * remotely provisioned keys available. This behavior mirrors keystore key attestation.

     *

     * This field was added in API version 4.

     */

    boolean isRemoteKeyProvisioningSupported = false;

}