aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/spongycastle/openpgp/jcajce/JcaSkipMarkerPGPObjectFactory.java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into performanceVincent Breitmoser2016-02-101-32/+0
|\
| * Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-3/+3
|/
* add documentation on marker packet skippingVincent2015-11-151-1/+9
* decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-151-0/+24