diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-02 16:42:07 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-02 16:42:07 +0200 |
commit | b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d (patch) | |
tree | d739e18bad160bb12f67d9291e7e69fa4fc0954f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java | |
parent | fe2c17cdeb59ebd65391bf92dc8afb20431ce824 (diff) | |
download | open-keychain-b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d.tar.gz open-keychain-b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d.tar.bz2 open-keychain-b08aa132e06abe6052d8e19b4bf7c4cfa4e2e95d.zip |
Remove version 3 checks, no longer supported in import
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java index c7a8bb1d0..5afbd81ea 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java @@ -207,21 +207,23 @@ public class UncachedPublicKey { return getAlgorithm() == PGPPublicKey.ECDH || getAlgorithm() == PGPPublicKey.ECDSA; } + /** + * Get all key usage flags + * + * TODO make this safe + */ @SuppressWarnings("unchecked") - // TODO make this safe public int getKeyUsage() { if(mCacheUsage == null) { mCacheUsage = 0; - if (mPublicKey.getVersion() >= 4) { - for (PGPSignature sig : new IterableIterator<PGPSignature>(mPublicKey.getSignatures())) { - if (mPublicKey.isMasterKey() && sig.getKeyID() != mPublicKey.getKeyID()) { - continue; - } + for (PGPSignature sig : new IterableIterator<PGPSignature>(mPublicKey.getSignatures())) { + if (mPublicKey.isMasterKey() && sig.getKeyID() != mPublicKey.getKeyID()) { + continue; + } - PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets(); - if (hashed != null) { - mCacheUsage |= hashed.getKeyFlags(); - } + PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets(); + if (hashed != null) { + mCacheUsage |= hashed.getKeyFlags(); } } } @@ -229,11 +231,11 @@ public class UncachedPublicKey { } public boolean canAuthenticate() { - return mPublicKey.getVersion() <= 3 || (getKeyUsage() & KeyFlags.AUTHENTICATION) != 0; + return (getKeyUsage() & KeyFlags.AUTHENTICATION) != 0; } public boolean canCertify() { - return mPublicKey.getVersion() <= 3 || (getKeyUsage() & KeyFlags.CERTIFY_OTHER) != 0; + return (getKeyUsage() & KeyFlags.CERTIFY_OTHER) != 0; } public boolean canEncrypt() { @@ -250,9 +252,7 @@ public class UncachedPublicKey { return true; } - return mPublicKey.getVersion() <= 3 || - (getKeyUsage() & (KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE)) != 0; - + return (getKeyUsage() & (KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE)) != 0; } public boolean canSign() { @@ -261,7 +261,7 @@ public class UncachedPublicKey { return true; } - return mPublicKey.getVersion() <= 3 || (getKeyUsage() & KeyFlags.SIGN_DATA) != 0; + return (getKeyUsage() & KeyFlags.SIGN_DATA) != 0; } public byte[] getFingerprint() { |