aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * make certify routines more robust (#1016)Vincent Breitmoser2015-01-031-0/+6
| * add more descriptive string about non-mdc encrypted dataVincent Breitmoser2015-01-031-1/+1
| * encapsulate high level edit key into new operation classVincent Breitmoser2015-01-031-40/+39
| * deal with non-existent user ids during import (#994)Vincent Breitmoser2015-01-021-2/+4
| * get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-021-25/+17
| * fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-021-7/+13
| * extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-8/+45
| * small improvements regarding pin tests and loggingVincent Breitmoser2015-01-011-0/+5
| * add empty notation data packet only if necessaryVincent Breitmoser2015-01-011-16/+35
| * tests: add multi key encryption/decryption test, new way for fake passphrase ...Vincent Breitmoser2015-01-012-2/+2
| * Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Vincent Breitmoser2014-12-301-1/+4
| |\
| * | some small notation data fixesVincent Breitmoser2014-12-302-10/+10
| * | add PIN as a SecretKeyTypeVincent Breitmoser2014-12-304-5/+27
| * | introduce handling of notation direct key signatures, and experimental pin no...Vincent Breitmoser2014-12-303-14/+112
* | | Passphrase wizard testsDominik Schürmann2015-01-061-0/+1
| |/ |/|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2014-12-291-53/+87
|\|
| * introduce new ChangeUnlockParcel packet for extended passphrase changing capa...Vincent Breitmoser2014-12-291-53/+87
* | New work on PIN and lock pattern UIDominik Schürmann2014-12-291-1/+6
|/
* Allow for creation date to be in the future up to one day to account for dive...Dominik Schürmann2014-12-281-4/+9
* Minor code cleanupDominik Schürmann2014-11-211-1/+1
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-261-0/+2
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-0/+4
* Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-261-0/+14