diff options
| author | Miguel Aranda <miguelaranda@google.com> | 2024-03-13 14:55:01 +0000 |
|---|---|---|
| committer | Miguel Aranda <miguelaranda@google.com> | 2024-03-15 12:40:43 +0000 |
| commit | de47c1cc8253d6e1be649dd3ad7a3a56bda33b9d (patch) | |
| tree | 137d818c27a4c50c360ce2c345efc48e548b2669 | |
| parent | e6b1e3af07b4ddaa97d18577b5e58f7a30aa672c (diff) | |
| download | conscrypt-de47c1cc8253d6e1be649dd3ad7a3a56bda33b9d.tar.gz | |
Make XDH key sizes 255 within Android12L-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)
Merged-In: I538534009f98306db6a65f2dcef84cbb98045aa0
Change-Id: I538534009f98306db6a65f2dcef84cbb98045aa0
Merged-In: I47ea1507edadc4d8f22f954797c14ee2a4ce8861
4 files changed, 4 insertions, 4 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 919be533..b7b41ef2 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/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java b/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java index 0a07c602..020be582 100644 --- a/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java +++ b/common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java @@ -27,6 +27,6 @@ public class KeyPairGeneratorTestXDH extends AbstractKeyPairGeneratorTest { @Override protected int getKeySize() { - return 256; + return 255; } } 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 eabd058c..9d746dc6 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. */ diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java b/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java index f2e3d0e1..3249c664 100644 --- a/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java +++ b/repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java @@ -31,6 +31,6 @@ public class KeyPairGeneratorTestXDH extends AbstractKeyPairGeneratorTest { @Override protected int getKeySize() { - return 256; + return 255; } } |