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

Correct IKeymasterDevice documentation.

Browse Source 
am: 744a37115a

Change-Id: I9f7ae4efef89723a7200d9fbd72ee0e3e0cd2954
This commit is contained in:
Shawn Willden
2019-04-23 11:23:31 -07:00
committed by android-build-merger
parent c1ac036a8c 744a37115a
commit dff8dd72a3
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
current.txt
View File

@@ -475,4 +475,4 @@ d8e7717e8187dd7453d4142f8f331e7c325e7a6f9e8d44ac0d52b3be502bfe83 android.hardwar
b53ac9d61c24efb16a2d63a861cef20680f6d57adb244a03b9778c675550628b android.hardware.secure_element@1.1::ISecureElementHalCallback b53ac9d61c24efb16a2d63a861cef20680f6d57adb244a03b9778c675550628b android.hardware.secure_element@1.1::ISecureElementHalCallback
# ABI preserving changes to HALs during Android R # ABI preserving changes to HALs during Android R
# none yet b69a7615c508acf5c5201efd1bfa3262167874fc3594e2db5a3ff93addd8ac75 android.hardware.keymaster@4.0::IKeymasterDevice

16
keymaster/4.0/IKeymasterDevice.hal
View File

@@ -624,7 +624,7 @@ interface IKeymasterDevice {
/** /**
* Exports a public key, returning the key in the specified format. * Exports a public key, returning the key in the specified format.
* *
* @parm keyFormat The format used for export. See KeyFormat in types.hal. * @parm keyFormat The format used for export. Must be KeyFormat::X509.
* *
* @param keyBlob The opaque descriptor returned by generateKey() or importKey(). The * @param keyBlob The opaque descriptor returned by generateKey() or importKey(). The
* referenced key must be asymmetric. * referenced key must be asymmetric.
@@ -639,7 +639,7 @@ interface IKeymasterDevice {
* value, it must be computationally infeasible for the secure hardware to obtain the key * value, it must be computationally infeasible for the secure hardware to obtain the key
* material. * material.
* *
* @return keyMaterial The public key material in PKCS#8 format. * @return keyMaterial The public key material in X.509 format.
*/ */
exportKey(KeyFormat keyFormat, vec<uint8_t> keyBlob, vec<uint8_t> clientId, exportKey(KeyFormat keyFormat, vec<uint8_t> keyBlob, vec<uint8_t> clientId,
vec<uint8_t> appData) generates (ErrorCode error, vec<uint8_t> keyMaterial); vec<uint8_t> appData) generates (ErrorCode error, vec<uint8_t> keyMaterial);
@@ -1005,13 +1005,11 @@ interface IKeymasterDevice {
* *
* -- EC Keys -- * -- EC Keys --
* *
* EC key operations must specify exactly one padding mode in inParams. If unspecified or * EC private key operations must specify exactly one digest in inParams. If unspecified or
* specified more than once, begin() must return ErrorCode::UNSUPPORTED_PADDING_MODE. * specified more than once, begin() must return ErrorCode::UNSUPPORTED_DIGEST. For private key
* * operations, (KeyPurpose::SIGN), if the specified digest is not in the key's authorization
* Private key operations (KeyPurpose::SIGN) need authorization of digest and padding, which * list, begin() must return ErrorCode::INCOMPATIBLE_DIGEST. Public key operations
* means that the key authorizations must contain the specified values. If not, begin() must * (KeyPurpose::VERIFY) are permitted with unauthorized digest.
* return ErrorCode::INCOMPATIBLE_DIGEST. Public key operations (KeyPurpose::VERIFY) are
* permitted with unauthorized digest or padding.
* *
* -- AES Keys -- * -- AES Keys --
* *