diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-19 13:12:08 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-19 13:12:08 +0100 |
commit | e75fd5a156acf3e2012dd8ea5eeff416e08773e1 (patch) | |
tree | a4c71247acb6acd3c9c93f17e02262e89371df42 | |
parent | 7436bf578c23dc012dd90a60f82d9afe3ee891e3 (diff) | |
download | open-keychain-e75fd5a156acf3e2012dd8ea5eeff416e08773e1.tar.gz open-keychain-e75fd5a156acf3e2012dd8ea5eeff416e08773e1.tar.bz2 open-keychain-e75fd5a156acf3e2012dd8ea5eeff416e08773e1.zip |
cleanup
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationIncoming.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationIncoming.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationIncoming.java index b6d7433be..51e93935d 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationIncoming.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperationIncoming.java @@ -528,7 +528,7 @@ public class PgpOperationIncoming { return returnData; } - private boolean verifyKeyBinding(Context mContext, PGPSignature signature, PGPPublicKey signatureKey) { + private static boolean verifyKeyBinding(Context mContext, PGPSignature signature, PGPPublicKey signatureKey) { long signatureKeyId = signature.getKeyID(); boolean keyBinding_isok = false; String userId = null; @@ -546,7 +546,7 @@ public class PgpOperationIncoming { return keyBinding_isok; } - private boolean verifyKeyBinding(PGPPublicKey masterPublicKey, PGPPublicKey signingPublicKey) { + private static boolean verifyKeyBinding(PGPPublicKey masterPublicKey, PGPPublicKey signingPublicKey) { boolean subkeyBinding_isok = false; boolean tmp_subkeyBinding_isok = false; boolean primkeyBinding_isok = false; @@ -589,7 +589,7 @@ public class PgpOperationIncoming { return (subkeyBinding_isok & primkeyBinding_isok); } - private boolean verifyPrimaryBinding(PGPSignatureSubpacketVector Pkts, PGPPublicKey masterPublicKey, PGPPublicKey signingPublicKey) { + private static boolean verifyPrimaryBinding(PGPSignatureSubpacketVector Pkts, PGPPublicKey masterPublicKey, PGPPublicKey signingPublicKey) { boolean primkeyBinding_isok = false; JcaPGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider() .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME); @@ -622,7 +622,6 @@ public class PgpOperationIncoming { return primkeyBinding_isok; } - // taken from ClearSignedFileProcessor in BC private static void processLine(PGPSignature sig, byte[] line) throws SignatureException, IOException { |