diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-03 18:05:30 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-03 18:05:30 +0200 |
commit | 46d45ebd674897ec49662475c9bd335045a6b8eb (patch) | |
tree | 10f6bd720e8832571e85b96345afc8429c4cfdf3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp | |
parent | 05e9eefda96615bfd1ddef6448b1883f0a07c173 (diff) | |
download | open-keychain-46d45ebd674897ec49662475c9bd335045a6b8eb.tar.gz open-keychain-46d45ebd674897ec49662475c9bd335045a6b8eb.tar.bz2 open-keychain-46d45ebd674897ec49662475c9bd335045a6b8eb.zip |
Fix mAllowedKeyIds
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index d7eb30f16..e7bb6d7b1 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -286,12 +286,12 @@ public class PgpDecryptVerify { // allow only specific keys for decryption? if (mAllowedKeyIds != null) { + long masterKeyId = secretEncryptionKey.getRing().getMasterKeyId(); Log.d(Constants.TAG, "encData.getKeyID(): " + subKeyId); Log.d(Constants.TAG, "mAllowedKeyIds: " + mAllowedKeyIds); - Log.d(Constants.TAG, "masterKeyId: " - + secretEncryptionKey.getRing().getMasterKeyId()); + Log.d(Constants.TAG, "masterKeyId: " + masterKeyId); - if (!mAllowedKeyIds.contains(subKeyId)) { + if (!mAllowedKeyIds.contains(masterKeyId)) { // this key is in our db, but NOT allowed! // continue with the next packet in the while loop continue; |