Snap for 11216811 from 46a3173f470bad7de184bf090aac277727ca7448 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: Iad83fece7f523102e593d65c73cf4857c34d4fa5

1 files changed, 11 insertions, 2 deletions

diff --git a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java
index dbcc5ab..c0ee341 100644
--- a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java
+++ b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java
@@ -38,6 +38,7 @@ import javax.crypto.spec.PSource;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.Ignore;
+import android.security.Flags;
 import android.security.keystore.KeyProtection;
 import android.security.keystore.KeyProperties;
 import android.keystore.cts.util.KeyStoreUtil;
@@ -66,9 +67,17 @@ public class RsaOaepTest {
             KeyProperties.PURPOSE_DECRYPT)
             .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1,
                     KeyProperties.ENCRYPTION_PADDING_RSA_OAEP)
-            .setDigests(digest)
-            .setMgf1Digests(mgfDigest)
             .setIsStrongBoxBacked(isStrongBox);
+    if (Flags.mgf1DigestSetter()) {
+      keyProtection.setDigests(digest);
+      keyProtection.setMgf1Digests(mgfDigest);
+    } else {
+      if (digest.equalsIgnoreCase(mgfDigest)) {
+        keyProtection.setDigests(digest);
+      } else {
+        keyProtection.setDigests(digest, mgfDigest);
+      }
+    }
     return (PrivateKey) KeyStoreUtil.saveKeysToKeystore(KEY_ALIAS_1, pubKey, privKey,
             keyProtection.build()).getKey(KEY_ALIAS_1, null);
   }