commit 39fd306e43d8de87be53b8a5704f8643ecfba4ae
author Chirag Pathak <pathakc@google.com> Mon Dec 21 18:44:53 2020 -0500
committer David Zeuthen <zeuthen@google.com> Mon Dec 21 18:45:35 2020 -0500
tree 8e43522d7a240913bfd08c91c6a320348adbd37f
parent c4b24df2efe84f942ebf9489f7abb0f459c5a91b

Add libhardware support for RSA OAEP MGF1.

Test: atest VtsAidlKeyMintV1_0TargetTest
Bug: 160968519
Change-Id: I2c534d2a9ad401a48451ca392ebf6e0039345de4

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index f4bed73..f2deb72 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -71,6 +71,7 @@
     KM_TAG_INCLUDE_UNIQUE_ID = KM_BOOL | 202,      /* If true, attestation certificates for this key
                                                     * will contain an application-scoped and
                                                     * time-bounded device-unique ID. (keymaster2) */
+    KM_TAG_RSA_OAEP_MGF_DIGEST = KM_ENUM_REP | 203, /* keymaster_digest_t. */
 
     /* Other hardware-enforced. */
     KM_TAG_BLOB_USAGE_REQUIREMENTS = KM_ENUM | 301, /* keymaster_key_blob_usage_requirements_t */
@@ -490,6 +491,8 @@
     KM_ERROR_EARLY_BOOT_ENDED = -73,
     KM_ERROR_ATTESTATION_KEYS_NOT_PROVISIONED = -74,
     KM_ERROR_ATTESTATION_IDS_NOT_PROVISIONED = -75,
+    KM_ERROR_INCOMPATIBLE_MGF_DIGEST = -78,
+    KM_ERROR_UNSUPPORTED_MGF_DIGEST = -79,
 
     KM_ERROR_UNIMPLEMENTED = -100,
     KM_ERROR_VERSION_MISMATCH = -101,