aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrashant Patil <patilprashant@google.com>2023-09-26 23:30:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-26 23:30:51 +0000
commitb0615624014988f2b91987e8e19660df7d99d481 (patch)
tree684fb3ce3eccc20857489e6d24af95f7f0ab9f2b
parent516d133846669dfa44f120e425fe9148809c671a (diff)
parent2a4d12cb48077ac9c5f3960c51f428148a540cba (diff)
downloadwycheproof-b0615624014988f2b91987e8e19660df7d99d481.tar.gz
Used a MGF1 digest setter method am: 96b5c29825 am: abea674f7c am: 2a4d12cb48
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2623773 Change-Id: I4f28194ab1e052611cbb4a0ab3cec0fc3d4e5b34 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);
}