aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* 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
* remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-4/+0
* slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
* change the way merging is loggedVincent Breitmoser2014-10-251-2/+2
* Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-161-5/+11
* some cleanup and documentation of *Operation classesVincent Breitmoser2014-10-151-1/+0
* make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperationVincent Breitmoser2014-10-132-56/+25
* CertifyOperation is not a Pgp- operationVincent Breitmoser2014-10-121-6/+15
* move around package structure a bitVincent Breitmoser2014-10-107-491/+12
* move operations into ops package, introduce BaseOperation classVincent Breitmoser2014-10-103-52/+77
* Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2014-10-097-24/+63
|\
| * Replace many PgpGeneralExceptions with PgpKeyNotFoundExceptionDominik Schürmann2014-10-097-24/+63
| * Revert "Replace PgpGeneralException with NotFoundException where appropriate"Dominik Schürmann2014-10-096-37/+30
| * Replace PgpGeneralException with NotFoundException where appropriateDominik Schürmann2014-10-096-30/+37
* | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2014-10-091-1/+1
|\ \ | |/ |/|
| * yubikey: check with correct subkey id for sign operationVincent Breitmoser2014-10-041-1/+1
* | Remove unnecessary exceptionDominik Schürmann2014-10-082-9/+4
* | Big error screen if signature is invalid or key is revoked/expired, also fixe...Dominik Schürmann2014-10-082-3/+19
* | Move utf8 check for user id upwardsDominik Schürmann2014-10-071-4/+5
* | Fix MSG_MF_UID_PRIMARY logDominik Schürmann2014-10-071-1/+1
* | use sub results in importVincent Breitmoser2014-10-051-2/+6
* | add support for second line in log viewVincent Breitmoser2014-10-051-0/+3
* | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain i...Vincent Breitmoser2014-10-041-2/+12
|\ \
| * | Pass imported master key ids via result parcelDominik Schürmann2014-10-041-2/+12
* | | certify: get rid of fingerprint checkVincent Breitmoser2014-10-041-5/+0
|/ /
* | improve CertifyResult, add custom notifyVincent Breitmoser2014-10-041-3/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 07:57:44 +0000