diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-28 15:17:09 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-28 15:17:09 +0200 |
commit | c34a159cae783178b692022a584e1f937cc652ca (patch) | |
tree | d70c9ec339c843bef2ce534e6d89334fb4e55d97 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java | |
parent | 8131daa6380ed752c4d31cd6a40650d9ac5b9817 (diff) | |
download | open-keychain-c34a159cae783178b692022a584e1f937cc652ca.tar.gz open-keychain-c34a159cae783178b692022a584e1f937cc652ca.tar.bz2 open-keychain-c34a159cae783178b692022a584e1f937cc652ca.zip |
fix method visibility for tests
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java index d0808d446..8fb3402b2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java @@ -18,11 +18,8 @@ package org.sufficientlysecure.keychain.pgp; -import org.spongycastle.bcpg.SignatureSubpacketTags; import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.openpgp.PGPPublicKey; -import org.spongycastle.openpgp.PGPSignature; -import org.spongycastle.openpgp.PGPSignatureSubpacketVector; import org.spongycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; import org.sufficientlysecure.keychain.util.IterableIterator; @@ -40,7 +37,6 @@ public class CanonicalizedPublicKey extends UncachedPublicKey { // this is the parent key ring final KeyRing mRing; - private Integer mCacheUsage = null; CanonicalizedPublicKey(KeyRing ring, PGPPublicKey key) { super(key); @@ -52,7 +48,7 @@ public class CanonicalizedPublicKey extends UncachedPublicKey { } JcePublicKeyKeyEncryptionMethodGenerator getPubKeyEncryptionGenerator() { - return new JcePublicKeyKeyEncryptionMethodGenerator(mPublicKey); + return new JcePublicKeyKeyEncryptionMethodGenerator(mPublicKey); } public boolean canSign() { @@ -68,32 +64,6 @@ public class CanonicalizedPublicKey extends UncachedPublicKey { return false; } - /** - * Get all key usage flags. - * If at least one key flag subpacket is present return these. - * If no subpacket is present it returns null. - */ - @SuppressWarnings("unchecked") - public Integer getKeyUsage() { - if (mCacheUsage == null) { - for (PGPSignature sig : new IterableIterator<PGPSignature>(mPublicKey.getSignatures())) { - if (mPublicKey.isMasterKey() && sig.getKeyID() != mPublicKey.getKeyID()) { - continue; - } - - PGPSignatureSubpacketVector hashed = sig.getHashedSubPackets(); - if (hashed != null && hashed.getSubpacket(SignatureSubpacketTags.KEY_FLAGS) != null) { - // init if at least one key flag subpacket has been found - if (mCacheUsage == null) { - mCacheUsage = 0; - } - mCacheUsage |= hashed.getKeyFlags(); - } - } - } - return mCacheUsage; - } - public boolean canCertify() { // if key flags subpacket is available, honor it! if (getKeyUsage() != null) { @@ -129,4 +99,9 @@ public class CanonicalizedPublicKey extends UncachedPublicKey { return false; } + + /** Same method as superclass, but we make it public. */ + public Integer getKeyUsage() { + return super.getKeyUsage(); + } } |