diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-28 06:49:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-28 06:49:22 +0000 |
| commit | 8adb0c54dc93469c5c8de9a34487c0102be1c5b1 (patch) | |
| tree | cec47ead12e435072cce20bebcaeddd793f07c43 /keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java | |
| parent | 5a9d47d7d368b6926030e897dd5e663f94fd8a5f (diff) | |
| parent | 9f05b44a151a2bb2836354906833fc014d201509 (diff) | |
| download | wycheproof-8adb0c54dc93469c5c8de9a34487c0102be1c5b1.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24023904', 'googleplex-android-review.googlesource.com/24217382', 'googleplex-android-review.googlesource.com/24149433'] into udc-release. am: 9f05b44a15android14-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wycheproof/+/24237882
Change-Id: I4d0cc03c91913998919a9cd8d08a64e2fbc3a6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java')
| -rw-r--r-- | keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java b/keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java index 3a42761..81be1bd 100644 --- a/keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java +++ b/keystore-cts/java/com/google/security/wycheproof/testcases/MacTest.java @@ -332,6 +332,9 @@ public class MacTest { @Test public void testLongMacSha1() throws Exception { + // b/244609904#comment64 + KeyStoreUtil.assumeKeyMintV1OrNewer(false); + testLongMac( "HMACSHA1", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f", @@ -348,6 +351,8 @@ public class MacTest { @Test public void testLongMacSha256() throws Exception { + // b/244609904#comment64 + KeyStoreUtil.assumeKeyMintV1OrNewer(false); testLongMacSha256(false); } @Test @@ -375,6 +380,9 @@ public class MacTest { @Test public void testLongMacSha384() throws Exception { + // b/244609904#comment64 + KeyStoreUtil.assumeKeyMintV1OrNewer(false); + testLongMac( "HMACSHA384", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" @@ -395,6 +403,9 @@ public class MacTest { @Test public void testLongMacSha512() throws Exception { + // b/244609904#comment64 + KeyStoreUtil.assumeKeyMintV1OrNewer(false); + testLongMac( "HMACSHA512", "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" |