Ensure RSA_OAEP_MGF_DIGEST tags are returned am: 5e9b27f3b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/22892744
Change-Id: I5311baf7f2799ceb0608f0d88b4be6cb608bdc64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/src/key_parameter.rs b/keystore2/src/key_parameter.rs
index b3dcf45..5da95d9 100644
--- a/keystore2/src/key_parameter.rs
+++ b/keystore2/src/key_parameter.rs
@@ -837,6 +837,11 @@
#[serde(serialize_with = "serialize_primitive")]
#[key_param(tag = DIGEST, field = Digest)]
Digest(Digest),
+ /// Digest algorithms that can be used for MGF in RSA-OAEP.
+ #[serde(deserialize_with = "deserialize_primitive")]
+ #[serde(serialize_with = "serialize_primitive")]
+ #[key_param(tag = RSA_OAEP_MGF_DIGEST, field = Digest)]
+ RsaOaepMgfDigest(Digest),
/// Padding modes that may be used with the key. Relevant to RSA, AES and 3DES keys.
#[serde(deserialize_with = "deserialize_primitive")]
#[serde(serialize_with = "serialize_primitive")]
@@ -1098,6 +1103,7 @@
Tag::BLOCK_MODE => return KmKeyParameterValue::BlockMode(Default::default()),
Tag::PADDING => return KmKeyParameterValue::PaddingMode(Default::default()),
Tag::DIGEST => return KmKeyParameterValue::Digest(Default::default()),
+ Tag::RSA_OAEP_MGF_DIGEST => return KmKeyParameterValue::Digest(Default::default()),
Tag::EC_CURVE => return KmKeyParameterValue::EcCurve(Default::default()),
Tag::ORIGIN => return KmKeyParameterValue::Origin(Default::default()),
Tag::PURPOSE => return KmKeyParameterValue::KeyPurpose(Default::default()),