diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 01:01:05 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 01:01:09 +0100 |
commit | 529b9518c12208f281af15945d06389050abd887 (patch) | |
tree | 3fbe63063ae4187d9343287fce149a4848658a89 /OpenKeychain/src/main/java/org/spongycastle | |
parent | ba2c5c3bd0a2c4b6c7f0f0af74a6fd22e6213c4a (diff) | |
download | open-keychain-529b9518c12208f281af15945d06389050abd887.tar.gz open-keychain-529b9518c12208f281af15945d06389050abd887.tar.bz2 open-keychain-529b9518c12208f281af15945d06389050abd887.zip |
decrypt: skip all encountered marker packets (fix #1582)
Diffstat (limited to 'OpenKeychain/src/main/java/org/spongycastle')
-rw-r--r-- | OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java b/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java new file mode 100644 index 000000000..a60c8e499 --- /dev/null +++ b/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java @@ -0,0 +1,24 @@ +package org.spongycastle.openpgp.jcajce; + + +import java.io.IOException; +import java.io.InputStream; + +import org.spongycastle.openpgp.PGPMarker; + + +public class JcaSkipMarkerPGPObjectFactory extends JcaPGPObjectFactory { + + public JcaSkipMarkerPGPObjectFactory(InputStream in) { + super(in); + } + + @Override + public Object nextObject() throws IOException { + Object o = super.nextObject(); + while (o instanceof PGPMarker) { + o = super.nextObject(); + } + return o; + } +} |