commit 82ed88b565e0355fe364ab8564116777179381e1
author Miguel Aranda <miguelaranda@google.com> Wed Mar 13 14:55:01 2024 +0000
committer Miguel Aranda <miguelaranda@google.com> Fri Mar 15 12:29:13 2024 +0000
tree 2f8a4bd071d985d6927588997b93f398715b9f1a
parent 2891cade71c2d0f2adcf0206eabf0885be0a7046

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
Change-Id: I538534009f98306db6a65f2dcef84cbb98045aa0
Merged-In: I47ea1507edadc4d8f22f954797c14ee2a4ce8861

common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTest.java

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 919be53..b7b41ef 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 @@
         putKeySize("EC", 256);
         putKeySize("EC", 384);
         putKeySize("EC", 521);
-        putKeySize("XDH", 256);
+        putKeySize("XDH", 255);
     }
 
     /** Elliptic Curve Crypto named curves that should be supported. */

common/src/test/java/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java

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 0a07c60..020be58 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 @@
 
     @Override
     protected int getKeySize() {
-        return 256;
+        return 255;
     }
 }

repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTest.java

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 eabd058..9d746dc 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 @@
         putKeySize("EC", 256);
         putKeySize("EC", 384);
         putKeySize("EC", 521);
-        putKeySize("XDH", 256);
+        putKeySize("XDH", 255);
     }
 
     /** Elliptic Curve Crypto named curves that should be supported. */

repackaged/common/src/test/java/com/android/org/conscrypt/java/security/KeyPairGeneratorTestXDH.java

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 f2e3d0e..3249c66 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 @@
 
     @Override
     protected int getKeySize() {
-        return 256;
+        return 255;
     }
 }