diff options
| author | Miguel Aranda <miguelaranda@google.com> | 2024-03-13 14:55:01 +0000 |
|---|---|---|
| committer | Miguel Aranda <miguelaranda@google.com> | 2024-03-20 09:02:21 +0000 |
| commit | 55b8ed1d505e4fc9654f19961be2e9d67001f74e (patch) | |
| tree | 306c605f850ebea0a3460a7ce377864b2cd80cf8 | |
| parent | 5dc9cdaf41d6d15ab992ac27a79e556719b0f23e (diff) | |
| download | conscrypt-55b8ed1d505e4fc9654f19961be2e9d67001f74e.tar.gz | |
Make XDH key sizes 255 within Android11-tests-devandroid11-tests-dev
This is to be compatible with the changes within https://r.android.com/2887887, which cause issues when testing with mainline
Bug: 325853322
Test: atest KeyPairGeneratorTest
Test: atest KeyPairGeneratorTestXDH
(cherry picked from https://android-review.googlesource.com/q/commit:82ed88b565e0355fe364ab8564116777179381e1)
(cherry picked from https://android-review.googlesource.com/q/commit:de47c1cc8253d6e1be649dd3ad7a3a56bda33b9d)
Merged-In: I538534009f98306db6a65f2dcef84cbb98045aa0
Change-Id: I538534009f98306db6a65f2dcef84cbb98045aa0
Merged-In: I47ea1507edadc4d8f22f954797c14ee2a4ce8861
| -rw-r--r-- | common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java | 2 | ||||
| -rw-r--r-- | repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java b/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java index 0a73545e..62bcc58f 100644 --- a/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java +++ b/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java @@ -163,7 +163,7 @@ public class KeyPairGeneratorTest { putKeySize("EC", 256); putKeySize("EC", 384); putKeySize("EC", 521); - putKeySize("XDH", 256); + putKeySize("XDH", 255); } /** Elliptic Curve Crypto named curves that should be supported. */ diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java b/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java index 0c8bea33..7ac65b6c 100644 --- a/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java +++ b/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java @@ -167,7 +167,7 @@ public class KeyPairGeneratorTest { putKeySize("EC", 256); putKeySize("EC", 384); putKeySize("EC", 521); - putKeySize("XDH", 256); + putKeySize("XDH", 255); } /** Elliptic Curve Crypto named curves that should be supported. */ |