diff options
| author | Miguel Aranda <miguelaranda@google.com> | 2024-03-15 12:40:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-15 12:40:35 +0000 |
| commit | cae48a98d9f4c70dd1662716fe920b8ed501f856 (patch) | |
| tree | e938990f33f1d8d8995b2d9b594a5efc2bea3e9b | |
| parent | 16c88aaac1d2a91bc2159c43322a4e0497a41a7b (diff) | |
| parent | 82ed88b565e0355fe364ab8564116777179381e1 (diff) | |
| download | conscrypt-cae48a98d9f4c70dd1662716fe920b8ed501f856.tar.gz | |
Make XDH key sizes 255 within Android12L-tests-dev am: 82ed88b565
Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3001058
Change-Id: Id5f7456affdbfea5b61ac3ab69b8a90e0f56a718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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; } } |