Don't replace the Bouncy Castle security provider

We only use Bouncy Castle for scrypt, so replacing the security provider was a
nice to have. It's causing issues because Proguard removes Bouncy Castle
classes. As we just released a beta, this is a quick fix and we may revisit this
later.

app/src/main/java/com/beemdevelopment/aegis/crypto/CryptoUtils.java

@@ -3,7 +3,6 @@ package com.beemdevelopment.aegis.crypto;
 import android.os.Build;
 
 import org.bouncycastle.crypto.generators.SCrypt;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -13,9 +12,7 @@ import java.nio.charset.StandardCharsets;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
 import java.security.SecureRandom;
-import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 import java.util.Arrays;
 
@@ -39,15 +36,6 @@ public class CryptoUtils {
     public static final int CRYPTO_SCRYPT_r = 8;
     public static final int CRYPTO_SCRYPT_p = 1;
 
-    // replace the BC provider from Android with the one bundled with the app
-    static {
-        final Provider provider = Security.getProvider(BouncyCastleProvider.PROVIDER_NAME);
-        if (provider != null && !provider.getClass().equals(BouncyCastleProvider.class)) {
-            Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
     public static SecretKey deriveKey(byte[] input, SCryptParameters params) {
         byte[] keyBytes = SCrypt.generate(input, params.getSalt(), params.getN(), params.getR(), params.getP(), CRYPTO_AEAD_KEY_SIZE);
         return new SecretKeySpec(keyBytes, 0, keyBytes.length, "AES");

app/src/main/res/raw/notices.xml

@@ -31,10 +31,10 @@
         <license>MIT License</license>
     </notice>
     <notice>
-        <name>Spongycastle</name>
-        <url>https://github.com/rtyley/spongycastle/</url>
-        <copyright>Copyright (c) 2000-2017 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)</copyright>
-        <license>Apache Software License 2.0</license>
+        <name>Bouncy Castle</name>
+        <url>https://www.bouncycastle.org/</url>
+        <copyright>Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)</copyright>
+        <license>MIT License</license>
     </notice>
     <notice>
         <name>CircleImageView</name>