Snap for 11217755 from aab39d41736c29cd0e40c0b6dd19a611957df55b to sdk-release

Change-Id: If46d06b599f19c37f5e4ffc49d65258bd9800a3b

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);
   }