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

Commit 953cc9bf authored by Tommy Chiu's avatar Tommy Chiu Committed by Automerger Merge Worker
Browse files

Correct some descriptions of IRemotelyProvisionedComponent am: 88a0fd42 

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



Change-Id: Ieeddee7399c07962316502d901d9e734b537de09
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e99fbf5d 88a0fd42

security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl

+6 −21
Original line number Original line Diff line number Diff line
@@ -115,11 +115,9 @@ import android.hardware.security.keymint.RpcHardwareInfo; 
interface IRemotelyProvisionedComponent {

interface IRemotelyProvisionedComponent {

    const int STATUS_FAILED = 1;

    const int STATUS_FAILED = 1;

    const int STATUS_INVALID_MAC = 2;

    const int STATUS_INVALID_MAC = 2;

    // --------- START: Versions 1 and 2 Only ----------

    const int STATUS_PRODUCTION_KEY_IN_TEST_REQUEST = 3; // Versions 1 and 2 Only

    const int STATUS_PRODUCTION_KEY_IN_TEST_REQUEST = 3;

    const int STATUS_TEST_KEY_IN_PRODUCTION_REQUEST = 4;

    const int STATUS_TEST_KEY_IN_PRODUCTION_REQUEST = 4;

    const int STATUS_INVALID_EEK = 5;

    const int STATUS_INVALID_EEK = 5; // Versions 1 and 2 Only

    // --------- END: Versions 1 and 2 Only ------------

    const int STATUS_REMOVED = 6;

    const int STATUS_REMOVED = 6;





    /**

    /**
@@ -347,8 +345,8 @@ interface IRemotelyProvisionedComponent { 
     *     protected: bstr .cbor { 1 : AlgorithmEdDSA / AlgorithmES256 },

     *     protected: bstr .cbor { 1 : AlgorithmEdDSA / AlgorithmES256 },

     *     unprotected: {},

     *     unprotected: {},

     *     payload: bstr .cbor Data / nil,

     *     payload: bstr .cbor Data / nil,

     *     signature: bstr      ; PureEd25519(CDI_Leaf_Priv, bstr .cbor SignedDataSigStruct<Data>) /

     *     signature: bstr      ; PureEd25519(CDI_Leaf_Priv, SignedDataSigStruct<Data>) /

     *                          ; ECDSA(CDI_Leaf_Priv, bstr .cbor SignedDataSigStruct<Data>)

     *                          ; ECDSA(CDI_Leaf_Priv, SignedDataSigStruct<Data>)

     * ]

     * ]

     *

     *

     * ; Sig_structure for SignedData

     * ; Sig_structure for SignedData
@@ -427,8 +425,8 @@ interface IRemotelyProvisionedComponent { 
     *     protected : bstr .cbor { 1 : AlgorithmEdDSA / AlgorithmES256 },

     *     protected : bstr .cbor { 1 : AlgorithmEdDSA / AlgorithmES256 },

     *     unprotected: {},

     *     unprotected: {},

     *     payload: bstr .cbor DiceChainEntryPayload,

     *     payload: bstr .cbor DiceChainEntryPayload,

     *     signature: bstr ; PureEd25519(SigningKey, bstr .cbor DiceChainEntryInput) /

     *     signature: bstr ; PureEd25519(SigningKey, DiceChainEntryInput) /

     *                     ; ECDSA(SigningKey, bstr .cbor DiceChainEntryInput)

     *                     ; ECDSA(SigningKey, DiceChainEntryInput)

     *                     ; See RFC 8032 for details of how to encode the signature value

     *                     ; See RFC 8032 for details of how to encode the signature value

     *                     ; for Ed25519.

     *                     ; for Ed25519.

     * ]

     * ]
@@ -442,12 +440,6 @@ interface IRemotelyProvisionedComponent { 
     *

     *

     * ; The following section defines some types that are reused throughout the above

     * ; The following section defines some types that are reused throughout the above

     * ; data structures.

     * ; data structures.

     * PubKeyX25519 = {                 ; COSE_Key

     *      1 : 1,                      ; Key type : Octet Key Pair

     *     -1 : 4,                      ; Curve : X25519

     *     -2 : bstr                    ; Sender X25519 public key

     * }

     *

     * PubKeyEd25519 = {                ; COSE_Key

     * PubKeyEd25519 = {                ; COSE_Key

     *     1 : 1,                       ; Key type : octet key pair

     *     1 : 1,                       ; Key type : octet key pair

     *     3 : AlgorithmEdDSA,          ; Algorithm : EdDSA

     *     3 : AlgorithmEdDSA,          ; Algorithm : EdDSA
@@ -455,13 +447,6 @@ interface IRemotelyProvisionedComponent { 
     *     -2 : bstr                    ; X coordinate, little-endian

     *     -2 : bstr                    ; X coordinate, little-endian

     * }

     * }

     *

     *

     * PubKeyEcdhP256 = {               ; COSE_Key

     *      1 : 2,                      ; Key type : EC2

     *      -1 : 1,                     ; Curve : P256

     *      -2 : bstr                   ; Sender X coordinate

     *      -3 : bstr                   ; Sender Y coordinate

     * }

     *

     * PubKeyECDSA256 = {               ; COSE_Key

     * PubKeyECDSA256 = {               ; COSE_Key

     *     1 : 2,                       ; Key type : EC2

     *     1 : 2,                       ; Key type : EC2

     *     3 : AlgorithmES256,          ; Algorithm : ECDSA w/ SHA-256

     *     3 : AlgorithmES256,          ; Algorithm : ECDSA w/ SHA-256