From 44a9e4c6f00e6b3a26c258d9c252cb6938321e57 Mon Sep 17 00:00:00 2001
From: Pete Bentley <44170157+prbprbprb@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:56:56 +0100
Subject: [PATCH] Correct inverted logic in OpenSSLXDHKeyFactory. (#1165)

And add missing tests to the OpenJDK suite which
is how this got missed in #1156.
---
 common/src/main/java/org/conscrypt/OpenSSLXDHKeyFactory.java | 2 +-
 common/src/test/java/org/conscrypt/ConscryptSuite.java       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/org/conscrypt/OpenSSLXDHKeyFactory.java b/common/src/main/java/org/conscrypt/OpenSSLXDHKeyFactory.java
index 0f160b17e..c6babde48 100644
--- a/common/src/main/java/org/conscrypt/OpenSSLXDHKeyFactory.java
+++ b/common/src/main/java/org/conscrypt/OpenSSLXDHKeyFactory.java
@@ -82,7 +82,7 @@ protected <T extends KeySpec> T engineGetKeySpec(Key key, Class<T> keySpec)
         }
 
         // Support XDH or X25519 algorithm names per JEP 324
-        if (!"XDH".equals(key.getAlgorithm()) || !"X25519".equals(key.getAlgorithm()) ) {
+        if (!"XDH".equals(key.getAlgorithm()) && !"X25519".equals(key.getAlgorithm()) ) {
             throw new InvalidKeySpecException("Key must be an XDH or X25519 key");
         }
 
diff --git a/common/src/test/java/org/conscrypt/ConscryptSuite.java b/common/src/test/java/org/conscrypt/ConscryptSuite.java
index 36d706cca..2bcb85612 100644
--- a/common/src/test/java/org/conscrypt/ConscryptSuite.java
+++ b/common/src/test/java/org/conscrypt/ConscryptSuite.java
@@ -36,6 +36,8 @@
 import org.conscrypt.java.security.KeyFactoryTestEC;
 import org.conscrypt.java.security.KeyFactoryTestRSA;
 import org.conscrypt.java.security.KeyFactoryTestRSACrt;
+import org.conscrypt.java.security.KeyFactoryTestRSACustom;
+import org.conscrypt.java.security.KeyFactoryTestXDH;
 import org.conscrypt.java.security.KeyPairGeneratorTest;
 import org.conscrypt.java.security.KeyPairGeneratorTestDH;
 import org.conscrypt.java.security.KeyPairGeneratorTestDSA;
@@ -115,6 +117,8 @@
         KeyFactoryTestEC.class,
         KeyFactoryTestRSA.class,
         KeyFactoryTestRSACrt.class,
+        KeyFactoryTestRSACustom.class,
+        KeyFactoryTestXDH.class,
         KeyPairGeneratorTest.class,
         KeyPairGeneratorTestDH.class,
         KeyPairGeneratorTestDSA.class,