Encryption: use RSAPublicKey interface instead of concrete conscrypt class

This allows the code to work regardless of installed security provider.

Signed-off-by: Álvaro Brey <[email protected]>

Author: AlvaroBrey

app/src/androidTest/java/com/nextcloud/client/EndToEndRandomIT.java

@@ -52,7 +52,6 @@
 import com.owncloud.android.utils.FileStorageUtils;
 
 import org.bouncycastle.operator.OperatorCreationException;
-import org.conscrypt.OpenSSLRSAPublicKey;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -66,6 +65,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.interfaces.RSAPrivateCrtKey;
+import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
@@ -501,7 +501,7 @@ public void testCheckCSR() throws NoSuchAlgorithmException, IOException, Operato
 
         // check key
         RSAPrivateCrtKey privateKey = (RSAPrivateCrtKey) keyPair.getPrivate();
-        OpenSSLRSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString);
+        RSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString);
 
         BigInteger modulusPublic = publicKey.getModulus();
         BigInteger modulusPrivate = privateKey.getModulus();
@@ -614,7 +614,7 @@ private static void createKeys() throws Exception {
 
             // check key
             RSAPrivateCrtKey privateKey = (RSAPrivateCrtKey) keyPair.getPrivate();
-            OpenSSLRSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString);
+            RSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString);
 
             BigInteger modulusPublic = publicKey.getModulus();
             BigInteger modulusPrivate = privateKey.getModulus();

app/src/androidTest/java/com/owncloud/android/util/EncryptionTestIT.java

@@ -36,7 +36,6 @@
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.io.FileUtils;
-import org.conscrypt.OpenSSLRSAPublicKey;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -53,6 +52,7 @@
 import java.security.PrivateKey;
 import java.security.SecureRandom;
 import java.security.interfaces.RSAPrivateCrtKey;
+import java.security.interfaces.RSAPublicKey;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -184,7 +184,7 @@ public void encryptStringAsymmetricWrongPublicKey() throws Exception {
     @Test
     public void testModulus() throws Exception {
         KeyPair keyPair = EncryptionUtils.generateKeyPair();
-        OpenSSLRSAPublicKey publicKey = (OpenSSLRSAPublicKey) keyPair.getPublic();
+        RSAPublicKey publicKey = (RSAPublicKey) keyPair.getPublic();
         RSAPrivateCrtKey privateKey = (RSAPrivateCrtKey) keyPair.getPrivate();
 
         BigInteger modulusPublic = publicKey.getModulus();

app/src/main/java/com/owncloud/android/ui/dialog/SetupEncryptionDialogFragment.java

@@ -50,13 +50,12 @@
 import com.owncloud.android.utils.theme.ThemeButtonUtils;
 import com.owncloud.android.utils.theme.ThemeColorUtils;
 
-import org.conscrypt.OpenSSLRSAPublicKey;
-
 import java.io.IOException;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.PrivateKey;
 import java.security.interfaces.RSAPrivateCrtKey;
+import java.security.interfaces.RSAPublicKey;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
@@ -367,7 +366,7 @@ protected String doInBackground(Void... voids) {
 
                     // check key
                     RSAPrivateCrtKey privateKey = (RSAPrivateCrtKey) keyPair.getPrivate();
-                    OpenSSLRSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString);
+                    RSAPublicKey publicKey = EncryptionUtils.convertPublicKeyFromString(publicKeyString);
 
                     BigInteger modulusPublic = publicKey.getModulus();
                     BigInteger modulusPrivate = privateKey.getModulus();

app/src/main/java/com/owncloud/android/utils/EncryptionUtils.java

@@ -45,7 +45,6 @@
 import com.owncloud.android.operations.UploadException;
 
 import org.apache.commons.httpclient.HttpStatus;
-import org.conscrypt.OpenSSLRSAPublicKey;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -69,6 +68,7 @@
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPublicKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 import java.security.spec.PKCS8EncodedKeySpec;
@@ -852,7 +852,7 @@ public static RemoteOperationResult unlockFolder(OCFile parentFolder, OwnCloudCl
         }
     }
 
-    public static OpenSSLRSAPublicKey convertPublicKeyFromString(String string) throws CertificateException {
+    public static RSAPublicKey convertPublicKeyFromString(String string) throws CertificateException {
         String trimmedCert = string.replace("-----BEGIN CERTIFICATE-----\n", "")
             .replace("-----END CERTIFICATE-----\n", "");
         byte[] encodedCert = trimmedCert.getBytes(StandardCharsets.UTF_8);
@@ -861,6 +861,6 @@ public static OpenSSLRSAPublicKey convertPublicKeyFromString(String string) thro
         CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
         InputStream in = new ByteArrayInputStream(decodedCert);
         X509Certificate certificate = (X509Certificate) certFactory.generateCertificate(in);
-        return (OpenSSLRSAPublicKey) certificate.getPublicKey();
+        return (RSAPublicKey) certificate.getPublicKey();
     }
 }