tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct some descriptions of IRemotelyProvisionedComponent

Browse source 
- STATUS_TEST_KEY_IN_PRODUCTION_REQUEST is still required for V3
- PubKeyEcdhP256 & PubKeyX25519 are unused in V3
- SignedDataSigStruct and DiceChainEntryInput should be an cbor array
  when being the input of PureEd25519/ECDSA

Bug: 243454124
Test: VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ice400bb15413eac164f2630cc2fbb66e6d3624b1
This commit is contained in:
Tommy Chiu 2023-01-04 11:52:08 +00:00
parent 466f3c55a9
commit 88a0fd42c8
1 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
View file

@ -115,11 +115,9 @@ import android.hardware.security.keymint.RpcHardwareInfo;
interface IRemotelyProvisionedComponent {
const int STATUS_FAILED = 1;
const int STATUS_INVALID_MAC = 2;
// --------- START: Versions 1 and 2 Only ----------
const int STATUS_PRODUCTION_KEY_IN_TEST_REQUEST = 3;
const int STATUS_PRODUCTION_KEY_IN_TEST_REQUEST = 3; // Versions 1 and 2 Only
const int STATUS_TEST_KEY_IN_PRODUCTION_REQUEST = 4;
const int STATUS_INVALID_EEK = 5;
// --------- END: Versions 1 and 2 Only ------------
const int STATUS_INVALID_EEK = 5; // Versions 1 and 2 Only
const int STATUS_REMOVED = 6;
/**
@ -347,8 +345,8 @@ interface IRemotelyProvisionedComponent {
* protected: bstr .cbor { 1 : AlgorithmEdDSA / AlgorithmES256 },
* unprotected: {},
* payload: bstr .cbor Data / nil,
* signature: bstr ; PureEd25519(CDI_Leaf_Priv, bstr .cbor SignedDataSigStruct<Data>) /
* ; ECDSA(CDI_Leaf_Priv, bstr .cbor SignedDataSigStruct<Data>)
* signature: bstr ; PureEd25519(CDI_Leaf_Priv, SignedDataSigStruct<Data>) /
* ; ECDSA(CDI_Leaf_Priv, SignedDataSigStruct<Data>)
* ]
*
* ; Sig_structure for SignedData
@ -427,8 +425,8 @@ interface IRemotelyProvisionedComponent {
* protected : bstr .cbor { 1 : AlgorithmEdDSA / AlgorithmES256 },
* unprotected: {},
* payload: bstr .cbor DiceChainEntryPayload,
* signature: bstr ; PureEd25519(SigningKey, bstr .cbor DiceChainEntryInput) /
* ; ECDSA(SigningKey, bstr .cbor DiceChainEntryInput)
* signature: bstr ; PureEd25519(SigningKey, DiceChainEntryInput) /
* ; ECDSA(SigningKey, DiceChainEntryInput)
* ; See RFC 8032 for details of how to encode the signature value
* ; for Ed25519.
* ]
@ -442,12 +440,6 @@ interface IRemotelyProvisionedComponent {
*
* ; The following section defines some types that are reused throughout the above
* ; 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
* 1 : 1, ; Key type : octet key pair
* 3 : AlgorithmEdDSA, ; Algorithm : EdDSA
@ -455,13 +447,6 @@ interface IRemotelyProvisionedComponent {
* -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
* 1 : 2, ; Key type : EC2
* 3 : AlgorithmES256, ; Algorithm : ECDSA w/ SHA-256