diff options
| author | David Drysdale <drysdale@google.com> | 2023-04-24 17:24:30 +0100 |
|---|---|---|
| committer | Eran Messeri <eranm@google.com> | 2023-04-27 11:15:19 +0100 |
| commit | 5e9b27f3b46973b6a10ab615b7eb49f2f6fe2ffb (patch) | |
| tree | 7331f5b6903e61d80fac6b9bbc4701427feab36c | |
| parent | d2ff98075df6d8c928c2c5e2e1741994cb491be4 (diff) | |
| download | security-5e9b27f3b46973b6a10ab615b7eb49f2f6fe2ffb.tar.gz | |
Ensure RSA_OAEP_MGF_DIGEST tags are returned
Test: CtsKeystorePerformanceTestCases with printf debugging
Bug: 278157584
Ignore-AOSP-First: This is a cherry-pick from aosp
Merged-In: I39a286fece2fa2e3637bb41e127bb79034434af1
Change-Id: I0889279da00328a09e8f1f90c8e11d71067a9dec
| -rw-r--r-- | keystore2/src/key_parameter.rs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/keystore2/src/key_parameter.rs b/keystore2/src/key_parameter.rs index b3dcf45e..5da95d96 100644 --- a/keystore2/src/key_parameter.rs +++ b/keystore2/src/key_parameter.rs @@ -837,6 +837,11 @@ pub enum KeyParameterValue { #[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 @@ mod generated_key_parameter_tests { 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()), |