Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add more clarity about integer encoding for keys"

Browse Source
This commit is contained in:
Treehugger Robot
2023-01-07 00:36:40 +00:00
committed by Gerrit Code Review
parent 7e18359125 1386742e52
commit 7a15fa5005
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
security/rkp/aidl/android/hardware/security/keymint/IRemotelyProvisionedComponent.aidl
View File

@@ -222,7 +222,7 @@ interface IRemotelyProvisionedComponent {
* 2 : bstr ; KID : EEK ID
* 3 : -25, ; Algorithm : ECDH-ES + HKDF-256
* -1 : 4, ; Curve : X25519
* -2 : bstr ; X25519 public key
* -2 : bstr ; X25519 public key, little-endian
* }
*
* EekP256 = { ; COSE_Key
@@ -440,6 +440,9 @@ interface IRemotelyProvisionedComponent {
*
* ; The following section defines some types that are reused throughout the above
* ; data structures.
* ; NOTE: Integer encoding is different for Ed25519 and P256 keys:
* ; - Ed25519 is LE: https://www.rfc-editor.org/rfc/rfc8032#section-3.1
* ; - P256 is BE: https://www.secg.org/sec1-v2.pdf#page=19 (section 2.3.7)
* PubKeyEd25519 = { ; COSE_Key
* 1 : 1, ; Key type : octet key pair
* 3 : AlgorithmEdDSA, ; Algorithm : EdDSA
@@ -451,8 +454,8 @@ interface IRemotelyProvisionedComponent {
* 1 : 2, ; Key type : EC2
* 3 : AlgorithmES256, ; Algorithm : ECDSA w/ SHA-256
* -1 : 1, ; Curve: P256
* -2 : bstr, ; X coordinate
* -3 : bstr ; Y coordinate
* -2 : bstr, ; X coordinate, big-endian
* -3 : bstr ; Y coordinate, big-endian
* }
*
* AlgorithmES256 = -7

7
security/rkp/aidl/android/hardware/security/keymint/MacedPublicKey.aidl
View File

@@ -36,12 +36,15 @@ parcelable MacedPublicKey {
* ]
*
* ; NOTE: -70000 is deprecated for v3 HAL implementations.
* ; NOTE: Integer encoding is different for Ed25519 and P256 keys:
* ; - Ed25519 is LE: https://www.rfc-editor.org/rfc/rfc8032#section-3.1
* ; - P256 is BE: https://www.secg.org/sec1-v2.pdf#page=19 (section 2.3.7)
* PublicKey = { ; COSE_Key
* 1 : 2, ; Key type : EC2
* 3 : -7, ; Algorithm : ES256
* -1 : 1, ; Curve : P256
* -2 : bstr, ; X coordinate, little-endian
* -3 : bstr, ; Y coordinate, little-endian
* -2 : bstr, ; X coordinate, big-endian
* -3 : bstr, ; Y coordinate, big-endian
* -70000 : nil ; Presence indicates this is a test key. If set, K_mac is
* ; all zeros.
* },

10
security/rkp/aidl/android/hardware/security/keymint/ProtectedData.aidl
View File

@@ -209,7 +209,7 @@ parcelable ProtectedData {
* PubKeyX25519 = { ; COSE_Key
* 1 : 1, ; Key type : Octet Key Pair
* -1 : 4, ; Curve : X25519
* -2 : bstr ; Sender X25519 public key
* -2 : bstr ; Sender X25519 public key, little-endian
* }
*
* PubKeyEd25519 = { ; COSE_Key
@@ -222,16 +222,16 @@ parcelable ProtectedData {
* PubKeyEcdhP256 = { ; COSE_Key
* 1 : 2, ; Key type : EC2
* -1 : 1, ; Curve : P256
* -2 : bstr ; Sender X coordinate
* -3 : bstr ; Sender Y coordinate
* -2 : bstr ; Sender X coordinate, big-endian
* -3 : bstr ; Sender Y coordinate, big-endian
* }
*
* PubKeyECDSA256 = { ; COSE_Key
* 1 : 2, ; Key type : EC2
* 3 : AlgorithmES256, ; Algorithm : ECDSA w/ SHA-256
* -1 : 1, ; Curve: P256
* -2 : bstr, ; X coordinate
* -3 : bstr ; Y coordinate
* -2 : bstr, ; X coordinate, big-endian
* -3 : bstr ; Y coordinate, big-endian
* }
*
* AlgorithmES256 = -7