diff options
| author | Prashant Patil <patilprashant@google.com> | 2023-09-26 23:29:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-26 23:29:51 +0000 |
| commit | 2a4d12cb48077ac9c5f3960c51f428148a540cba (patch) | |
| tree | 684fb3ce3eccc20857489e6d24af95f7f0ab9f2b | |
| parent | 14a0cb5a6762d8cf63b51280d34da63dafea9afd (diff) | |
| parent | abea674f7c54310666ca90d6b0bc35afdf77d8c8 (diff) | |
| download | wycheproof-2a4d12cb48077ac9c5f3960c51f428148a540cba.tar.gz | |
Used a MGF1 digest setter method am: 96b5c29825 am: abea674f7c
Original change: https://android-review.googlesource.com/c/platform/external/wycheproof/+/2623773
Change-Id: I5285188e5fef5ab4cccf4f11f761f6d7cd14951d
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.java | 7 |
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); } |