diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-06 15:06:36 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-06 15:06:36 +0200 |
| commit | 8f40c6df5108f30dc424e4d802f49f3392738724 (patch) | |
| tree | 2d5c20bd06f2ae6f526e9d24a6a16d9384fa9a18 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | dfc396a44cc84556ee190418a0a5bc5752b0f148 (diff) | |
| download | open-keychain-8f40c6df5108f30dc424e4d802f49f3392738724.tar.gz open-keychain-8f40c6df5108f30dc424e4d802f49f3392738724.tar.bz2 open-keychain-8f40c6df5108f30dc424e4d802f49f3392738724.zip | |
use only primary and mutually bound subkeys for fingerprint verification
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index a6823d3ac..375775ff1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -62,7 +62,6 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.Certs; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingData; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainContract.Keys; -import org.sufficientlysecure.keychain.provider.KeychainContract.UserPackets; import org.sufficientlysecure.keychain.provider.KeychainContract.UpdatedKeys; import org.sufficientlysecure.keychain.remote.AccountSettings; import org.sufficientlysecure.keychain.remote.AppSettings; @@ -968,7 +967,7 @@ public class ProviderHelper { // If we have an expected fingerprint, make sure it matches if (expectedFingerprint != null) { - if (!canPublicRing.containsSubkey(expectedFingerprint)) { + if (!canPublicRing.containsBoundSubkey(expectedFingerprint)) { log(LogType.MSG_IP_FINGERPRINT_ERROR); return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog, null); } else { |