diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:57:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:57:47 +0000 |
| commit | 9c5901e3b7e09a7cbb7a06e6b5203ec7da4d6fde (patch) | |
| tree | 922230029c38d959bf7c501abe297d3ac4daab71 /keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java | |
| parent | 0d14eca0e9f9114711311984d2e53296594c1e4f (diff) | |
| parent | aab39d41736c29cd0e40c0b6dd19a611957df55b (diff) | |
| download | wycheproof-9c5901e3b7e09a7cbb7a06e6b5203ec7da4d6fde.tar.gz | |
Snap for 11400057 from aab39d41736c29cd0e40c0b6dd19a611957df55b to simpleperf-release
Change-Id: I37c7f9489303ff15654374f4a389e132e707ab89
Diffstat (limited to 'keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java')
| -rw-r--r-- | keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java | 13 |
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); } |