diff options
author | Andrew Comminos <andrew@comminos.com> | 2016-03-15 07:54:02 +0300 |
---|---|---|
committer | Andrew Comminos <andrew@comminos.com> | 2016-03-15 07:54:02 +0300 |
commit | 1c5338dcf3ddec10076eb4ec1281bcaea7e2e959 (patch) | |
tree | e88004cbea04e52d79532f166586821e0dcb90f8 | |
parent | d19754fb468994476b2ca8dfc00c244a8e072b04 (diff) |
Force BouncyCastleProvider in settings migration too.
-rw-r--r-- | app/src/main/java/com/morlunk/mumbleclient/Settings.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/src/main/java/com/morlunk/mumbleclient/Settings.java b/app/src/main/java/com/morlunk/mumbleclient/Settings.java index 450c4fe..30d470f 100644 --- a/app/src/main/java/com/morlunk/mumbleclient/Settings.java +++ b/app/src/main/java/com/morlunk/mumbleclient/Settings.java @@ -30,6 +30,8 @@ import com.morlunk.jumble.Constants; import com.morlunk.mumbleclient.db.DatabaseCertificate; import com.morlunk.mumbleclient.db.PlumbleSQLiteDatabase; +import org.spongycastle.jce.provider.BouncyCastleProvider; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -187,7 +189,7 @@ public class Settings { File certFile = new File(certPath); FileInputStream certInput = new FileInputStream(certFile); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - KeyStore oldStore = KeyStore.getInstance("PKCS12"); + KeyStore oldStore = KeyStore.getInstance("PKCS12", new BouncyCastleProvider()); oldStore.load(certInput, certPassword.toCharArray()); oldStore.store(outputStream, new char[0]); |