aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashant Patil <patilprashant@google.com>2023-09-27 00:33:12 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-27 00:33:12 +0000
commit793751da3ccd7fead86ed5f2ac85a6e5e73cbf74 (patch)
tree684fb3ce3eccc20857489e6d24af95f7f0ab9f2b
parente3211c8ebc1801739a07507559dddb0ac514fb5d (diff)
parent282a137d291de9ce4b63a55e2c3c1c2f240f77af (diff)
downloadwycheproof-793751da3ccd7fead86ed5f2ac85a6e5e73cbf74.tar.gz
Used a MGF1 digest setter method am: 96b5c29825 am: abea674f7c am: 2a4d12cb48 am: b061562401 am: 282a137d29
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2623773 Change-Id: I833fb0fe26d8787c5a755b833ff53b03175ae9fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java7
1 files changed, 2 insertions, 5 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 9c2cbf5..dbcc5ab 100644
--- a/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java
+++ b/keystore-cts/java/com/google/security/wycheproof/testcases/RsaOaepTest.java
@@ -66,12 +66,9 @@ public class RsaOaepTest {
KeyProperties.PURPOSE_DECRYPT)
.setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1,
KeyProperties.ENCRYPTION_PADDING_RSA_OAEP)
+ .setDigests(digest)
+ .setMgf1Digests(mgfDigest)
.setIsStrongBoxBacked(isStrongBox);
- 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);
}