aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* fix expiry of master keysVincent Breitmoser2015-03-151-15/+16
* Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
* change user_id primary key in database, use keyring rather than unified query...Vincent Breitmoser2015-03-111-0/+9
* make constant for certify hash algoDominik Schürmann2015-03-112-11/+6
* Fix expiry, revoked checks in OpenPgpSignatureResultBuilderDominik Schürmann2015-03-101-2/+2
* add support for certification of user attributesVincent Breitmoser2015-03-081-4/+68
* Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into pa...Dominik Schürmann2015-03-051-0/+2
|\
* | Use ArrayList instead of LinkedListDominik Schürmann2015-03-053-9/+11
* | Cleanup of PgpConstantsDominik Schürmann2015-03-051-24/+22
* | Add missing headerDominik Schürmann2015-03-051-0/+17
* | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-051-0/+30
* | Use static linked lists instead of arraysDominik Schürmann2015-03-054-33/+51
* | Add missing file with PGP ConstantsDominik Schürmann2015-03-051-0/+69
* | Remove advanced preferences, move compression as menu item in encrypt activit...Dominik Schürmann2015-03-055-129/+39
* | Better selection of preferred algorithmDominik Schürmann2015-03-055-20/+40
* | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
|/
* Merge keybase-proof branchDominik Schürmann2015-02-271-1/+163
|\
| * fix signature checkDominik Schürmann2014-11-221-2/+2
| * Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-222-8/+11
| * Use master key id for keybase proof verificationDominik Schürmann2014-11-221-10/+4
| * Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-1/+1
| |\
| * | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-1/+161
* | | split up and mark unsafe expiry-related methodsVincent Breitmoser2015-02-262-4/+25
* | | ignore revoked user ids for primary key expiryVincent Breitmoser2015-02-265-23/+82
* | | fix comments and some warnings in PgpDecryptVerifyVincent Breitmoser2015-02-171-9/+4
* | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-7/+5
* | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-017-294/+458
* | | Support verification of detached signaturesDominik Schürmann2015-01-271-92/+213
* | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-272-3/+33
|\ \ \
| * | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-272-3/+33
* | | | Fixes for detached signaturesDominik Schürmann2015-01-261-9/+26
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-2611-77/+582
|\| | |
| * | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-259-39/+23
| * | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+11
| * | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-252-9/+84
| * | | allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-241-1/+1
| * | | move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-242-25/+22
| * | | only respect most recent signature for key flagsVincent Breitmoser2015-01-192-12/+42
| * | | small fixes to user attribute handlingVincent Breitmoser2015-01-142-3/+26
| * | | fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
| * | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-144-4/+52
| * | | hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| * | | support addition of user attributesVincent Breitmoser2015-01-131-3/+49
| * | | add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
| * | | remove LinkedIdentity (committed earlier by accident)Vincent Breitmoser2015-01-131-160/+0
| * | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-123-0/+335
* | | | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-081-2/+1
* | | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-082-20/+76
|/ / /
* | | Clearup after lockpattern experimentsDominik Schürmann2015-01-061-6/+1
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-068-74/+258
|\ \ \