diff options
| author | Miguel Aranda <miguelaranda@google.com> | 2023-09-08 18:47:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-09-08 18:47:19 +0000 |
| commit | 40fb5584dbe3f9b5c23d06086d1f13cffc802074 (patch) | |
| tree | d9fec1cd2a6c53e5e7f3489d4870b25c987b5ca3 | |
| parent | 85705d4ecdd899b1980f72b3009474d43f9eef65 (diff) | |
| parent | ef94246894137b7f474829f2ac1f47be623b0c4f (diff) | |
| download | conscrypt-40fb5584dbe3f9b5c23d06086d1f13cffc802074.tar.gz | |
Mark noIv test as NonCts am: ef94246894
Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2745653
Change-Id: Idf85604b861128210da69f1ce5125991b5164553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java | 3 | ||||
| -rw-r--r-- | repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java b/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java index 439b554d..8f4f896e 100644 --- a/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java +++ b/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java @@ -70,6 +70,7 @@ import javax.crypto.spec.PBEParameterSpec; import javax.crypto.spec.PSource; import javax.crypto.spec.SecretKeySpec; import libcore.junit.util.EnableDeprecatedBouncyCastleAlgorithmsRule; +import libcore.test.annotation.NonCts; import org.bouncycastle.asn1.x509.KeyUsage; import org.conscrypt.Conscrypt; import org.conscrypt.TestUtils; @@ -4645,6 +4646,8 @@ public final class CipherTest { * TODO(27995180): consider whether we keep this compatibility. Consider whether we only allow * if an IV is passed in the parameters. */ + @NonCts(bug = 287231726, reason = "The test asserts buggy or non-breaking " + + "behaviors, but the behavior has been fixed in the future ART module version.") @Test public void test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV() throws Exception { Assume.assumeNotNull(Security.getProvider("BC")); diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java index a418d672..0a762d22 100644 --- a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java +++ b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java @@ -75,6 +75,7 @@ import javax.crypto.spec.PBEParameterSpec; import javax.crypto.spec.PSource; import javax.crypto.spec.SecretKeySpec; import libcore.junit.util.EnableDeprecatedBouncyCastleAlgorithmsRule; +import libcore.test.annotation.NonCts; import org.bouncycastle.asn1.x509.KeyUsage; import org.junit.Assume; import org.junit.BeforeClass; @@ -4641,6 +4642,8 @@ public final class CipherTest { * TODO(27995180): consider whether we keep this compatibility. Consider whether we only allow * if an IV is passed in the parameters. */ + @NonCts(bug = 287231726, reason = "The test asserts buggy or non-breaking " + + "behaviors, but the behavior has been fixed in the future ART module version.") @Test public void test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV() throws Exception { Assume.assumeNotNull(Security.getProvider("BC")); |