aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff options
context:
space:
mode:
authormar-v-in <github@rvin.mooo.com>2014-06-25 00:37:01 +0200
committermar-v-in <github@rvin.mooo.com>2014-06-25 00:37:01 +0200
commitf97ac83a89409dbc2501f02df32029f2d7ad4b1b (patch)
treef2077198e441350d5ee8f321257959582c16374b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
parent997faac90e2d002af1b5f45ef1893b118231b656 (diff)
downloadopen-keychain-f97ac83a89409dbc2501f02df32029f2d7ad4b1b.tar.gz
open-keychain-f97ac83a89409dbc2501f02df32029f2d7ad4b1b.tar.bz2
open-keychain-f97ac83a89409dbc2501f02df32029f2d7ad4b1b.zip
Move sks-keyservers.net CA into assets folder
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 9d355564f..dfd39b345 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -27,6 +27,7 @@ import android.os.Environment;
import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.helper.TlsHelper;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.PRNGFixes;
@@ -84,6 +85,8 @@ public class KeychainApplication extends Application {
// Update keyserver list as needed
Preferences.getPreferences(this).updateKeyServers();
+
+ TlsHelper.addStaticCA("pool.sks-keyservers.net", getAssets(), "sks-keyservers.netCA.cer");
}
public static void setupAccountAsNeeded(Context context) {