aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-03-18 20:05:29 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-03-18 20:05:29 +0000
commit2917d065880c014af3bd914857a84558d92361b6 (patch)
tree137d818c27a4c50c360ce2c345efc48e548b2669
parent4c94e1a5bd380c791a1442c64f61c92d626066c1 (diff)
parentde47c1cc8253d6e1be649dd3ad7a3a56bda33b9d (diff)
downloadconscrypt-2917d065880c014af3bd914857a84558d92361b6.tar.gz
Snap for 11586679 from de47c1cc8253d6e1be649dd3ad7a3a56bda33b9d to android12-tests-release
Change-Id: I21c1444363d6ad59a31fa0089ed1620a60bf0a29
-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;
}
}