Mirrors
/
open-keychain
mirror of https://github.com/open-keychain/open-keychain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make injectBouncyCastleProvider a public method

This commit is contained in:
Vincent Breitmoser 2020-05-30 20:32:01 +02:00
parent ba99a54d7a
commit 4a38c64853
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
View File

@ -53,17 +53,7 @@ public class KeychainApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
/*
* Sets our own Bouncy Castle library as preferred security provider
*
* because Android's default provider config has BC at position 3,
* we need to remove it and insert BC again at position 1 (above OpenSSLProvider!)
*
* (insertProviderAt() position starts from 1)
*/
Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
Security.insertProviderAt(new BouncyCastleProvider(), 1);
injectBouncyCastleProvider();
/*
* apply RNG fixes
@ -116,6 +106,19 @@ public class KeychainApplication extends Application {
TemporaryFileProvider.scheduleCleanupImmediately(getApplicationContext());
}
public static void injectBouncyCastleProvider() {
/*
* Sets our own Bouncy Castle library as preferred security provider
*
* because Android's default provider config has BC at position 3,
* we need to remove it and insert BC again at position 1 (above OpenSSLProvider!)
*
* (insertProviderAt() position starts from 1)
*/
Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
Security.insertProviderAt(new BouncyCastleProvider(), 1);
}
/**
* @return the OpenKeychain contact/keyserver sync account if it exists or was successfully
* created, null otherwise
@ -154,7 +157,7 @@ public class KeychainApplication extends Application {
}
}
private void updateLoggingStatus() {
public static void updateLoggingStatus() {
Timber.uprootAll();
boolean enableDebugLogging = Constants.DEBUG;
if (enableDebugLogging) {