aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-0/+7
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+4
* Remove support for v3 sig generationDominik Schürmann2014-08-141-80/+10
* Dont write version header by defaultDominik Schürmann2014-08-144-11/+25
* Better error handling for passphrase cache if key is missingDominik Schürmann2014-08-131-1/+3
* Update api libDominik Schürmann2014-08-112-7/+7
* Support mime type in metadataDominik Schürmann2014-08-111-2/+27
* Decrypt metadata apiDominik Schürmann2014-08-111-6/+6
* Get original filename for decryptionDominik Schürmann2014-08-111-2/+21
* Add option to pass original filename to PgpSignEncryptDominik Schürmann2014-08-111-12/+20
* progress for signing binaryDominik Schürmann2014-08-111-15/+27
* More fixes for decryption progressDominik Schürmann2014-08-111-18/+11
* Handle missing MDC as failed only if no valid signature is presentDominik Schürmann2014-08-102-1/+9
* More fixes for decryption progressDominik Schürmann2014-08-101-6/+4
* Handle missing integrity protection MDC packet as if integrity check would ha...Dominik Schürmann2014-08-101-4/+5
* Introduction of metadata api, starting to fix decryption progressDominik Schürmann2014-08-103-44/+84
* Use CompressionAlgorithmTags instead of homebrew constantsDominik Schürmann2014-08-051-2/+3
* Optimize importsDominik Schürmann2014-08-052-4/+1
* Edit key: key flagsDominik Schürmann2014-08-051-1/+1
* Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ...Dominik Schürmann2014-08-052-17/+14
* Add license headersDominik Schürmann2014-08-0411-0/+187
* Fixing lint complaints, removing unused resourcesDominik Schürmann2014-08-041-2/+2
* delete unused PgpConversionHelperVincent Breitmoser2014-08-041-102/+0
* small fix for MSG_MF_UID_ADD log entryVincent Breitmoser2014-08-011-1/+1
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-012-6/+2
|\
| * fix dumb mistake in modifySecretKeyVincent Breitmoser2014-08-012-6/+2
* | Add user id with dialogDominik Schürmann2014-08-011-3/+25
|/
* more fixes on canonicalization and progressVincent Breitmoser2014-07-312-21/+22
* completely overengineer progress indication in {modify,create}SecretKeyRing m...Vincent Breitmoser2014-07-311-15/+81
* fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
* always return an EditKeyResult in modifyKey methodVincent Breitmoser2014-07-311-25/+25
* reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-26/+65
* couple of logging fixesVincent Breitmoser2014-07-311-2/+3
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-3112-111/+98
* Better exception handling for import of keysDominik Schürmann2014-07-311-5/+5
* Merge branch 'ditch-appmsg'Vincent Breitmoser2014-07-292-20/+29
|\
| * introduce EditKeyResult with transient UncachedKeyRing (half-baked!)Vincent Breitmoser2014-07-271-9/+18
| * some more work on supertoast and result parcel stuffVincent Breitmoser2014-07-271-11/+11
* | watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-283-10/+19
|/
* canonicalize: couple of fixesVincent Breitmoser2014-07-262-18/+30
* generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
* UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
* fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-262-15/+18
* test and fix: adding an empty user id should failVincent Breitmoser2014-07-261-0/+5
* canonicalize: fix for testsVincent Breitmoser2014-07-193-5/+7
* Merge remote-tracking branch 'upstream/master'Daniel Albert2014-07-1610-130/+318
|\
| * Fallback if no primary user id existsDominik Schürmann2014-07-165-6/+23
| * move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)Vincent Breitmoser2014-07-155-15/+15
| * signatures: a revocation reason does NOT determine if a cert is a revocation ...Vincent Breitmoser2014-07-151-1/+1
| * merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-2/+6