diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-27 23:52:26 -0800 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-01-27 23:52:26 -0800 |
| commit | ba9ae9617e4363c31ccfaaafe7b13cf611c9dc94 (patch) | |
| tree | d379ec95f2e43b4eac89b37e4ffd608a3f609b9b /OpenPGP-Keychain/src/main/java | |
| parent | e094d295ea31d0c7bc239f585eb6049287a6681e (diff) | |
| parent | 4071ce8550c7b51299313526fc6cd46bbabc1e93 (diff) | |
| download | open-keychain-ba9ae9617e4363c31ccfaaafe7b13cf611c9dc94.tar.gz open-keychain-ba9ae9617e4363c31ccfaaafe7b13cf611c9dc94.tar.bz2 open-keychain-ba9ae9617e4363c31ccfaaafe7b13cf611c9dc94.zip | |
Merge pull request #229 from ashh87/master
re-enable getEmbeddedSignatures
Diffstat (limited to 'OpenPGP-Keychain/src/main/java')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java index f3f327e85..1402be435 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpOperation.java @@ -973,16 +973,16 @@ public class PgpOperation { boolean primkeyBinding_isok = false; JcaPGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider() .setProvider(Constants.BOUNCY_CASTLE_PROVIDER_NAME); - PGPSignatureList eSigList = null; - - if (Pkts.hasSubpacket(SignatureSubpacketTags.EMBEDDED_SIGNATURE)) { -// try { -// eSigList = Pkts.getEmbeddedSignatures(); -// } catch (IOException e) { -// return false; -// } catch (PGPException e) { -// return false; -// } + PGPSignatureList eSigList; + + if (Pkts.hasSubpacket(SignatureSubpacketTags.EMBEDDED_SIGNATURE)) { + try { + eSigList = Pkts.getEmbeddedSignatures(); + } catch (IOException e) { + return false; + } catch (PGPException e) { + return false; + } for (int j = 0; j < eSigList.size(); ++j) { PGPSignature emSig = eSigList.get(j); if (emSig.getSignatureType() == PGPSignature.PRIMARYKEY_BINDING) { |