aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Aranda <miguelaranda@google.com>2024-03-15 12:52:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2024-03-15 12:52:40 +0000
commit377325ca29d29b28b6904ce576f236d82c0159ce (patch)
treee1ff91b27bc0eed80364c1cbcd88e99318cefb44
parent766444dd0a282b0d50fd4fbebdeb13e1b7d162a2 (diff)
parentcae48a98d9f4c70dd1662716fe920b8ed501f856 (diff)
downloadconscrypt-377325ca29d29b28b6904ce576f236d82c0159ce.tar.gz
Make XDH key sizes 255 within Android12L-tests-dev am: 82ed88b565 am: cae48a98d9
Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/3001058 Change-Id: I4f563b1b6b0e23cd60ff765ef06d20399e83b949 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java2
-rw-r--r--common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java2
-rw-r--r--repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java2
-rw-r--r--repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java2
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;
}
}