aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-09-21 16:49:23 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-09-21 16:49:23 +0200
commit3a9709a35d3cf5cd2e93e49b75745226fd59ae2d (patch)
tree71d58b5b87edfd6b839ce8c53902cbc79882d40e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
parent7d9e44afd7f15b4a7db442a430cb6f570ac2a510 (diff)
downloadopen-keychain-3a9709a35d3cf5cd2e93e49b75745226fd59ae2d.tar.gz
open-keychain-3a9709a35d3cf5cd2e93e49b75745226fd59ae2d.tar.bz2
open-keychain-3a9709a35d3cf5cd2e93e49b75745226fd59ae2d.zip
Use api.keybase.io
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 56dd9a4cb..ebd48b9a5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -100,12 +100,7 @@ public class KeychainApplication extends Application {
TlsHelper.addPinnedCertificate("hkps.pool.sks-keyservers.net", getAssets(), "hkps.pool.sks-keyservers.net.CA.cer");
TlsHelper.addPinnedCertificate("pgp.mit.edu", getAssets(), "pgp.mit.edu.cer");
- // NOTE:
- // keybase.io.CA.cer only holds the CA issuing the actual keybase.io certificate, but this
- // is better than no pinning!
- // We are not using https://github.com/keybase/node-client/blob/master/src/ca.iced
- // because it is only valid for api.keybase.io (https://github.com/keybase/keybase-issues/issues/964)
- TlsHelper.addPinnedCertificate("keybase.io", getAssets(), "keybase.io.CA.cer");
+ TlsHelper.addPinnedCertificate("api.keybase.io", getAssets(), "api.keybase.io.CA.cer");
TemporaryStorageProvider.cleanUp(this);