aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
...
| * fix travis tests (more), minor comment editsVincent Breitmoser2014-08-161-4/+3
| * tests: add test for master key revocationVincent Breitmoser2014-08-161-2/+1
| * tests: more expected error typesVincent Breitmoser2014-08-161-1/+2
| * typed expected failures and a couple minor thingsVincent Breitmoser2014-08-161-3/+3
| * support for master key modifications, among other stuffVincent Breitmoser2014-08-161-181/+298
| * modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-1/+7
| * modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+12
| * Fix encrypt onlyDominik Schürmann2014-08-161-10/+10
| * support changing expiry of subkeys to noneVincent Breitmoser2014-08-141-1/+2
| * fix subkey certification canonicalization (why did the test not catch this?!)Vincent Breitmoser2014-08-141-1/+1
| * dem logixVincent Breitmoser2014-08-141-1/+1
| * merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+3
| * 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
* | Support for multiple hash algosDominik Schürmann2014-08-142-13/+25
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-147-104/+223
|\|
| * 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
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-0615-126/+208
|\|
| * 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' into yubikeyDominik Schürmann2014-08-013-9/+27
|\|
| * 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
| |/
* | Merge branch 'master' into yubikeyDominik Schürmann2014-08-0112-279/+406
|\|
| * 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