Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | deal with non-existent user ids during import (#994) | Vincent Breitmoser | 2015-01-02 | 1 | -2/+4 | |
| | | | | ||||||
| * | | | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 1 | -25/+17 | |
| | | | | ||||||
| * | | | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -7/+13 | |
| | | | | | | | | | | | | | | | | closes #1012 | |||||
| * | | | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 1 | -8/+45 | |
| | | | | ||||||
| * | | | small improvements regarding pin tests and logging | Vincent Breitmoser | 2015-01-01 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | add empty notation data packet only if necessary | Vincent Breitmoser | 2015-01-01 | 1 | -16/+35 | |
| | | | | ||||||
| * | | | tests: add multi key encryption/decryption test, new way for fake passphrase ↵ | Vincent Breitmoser | 2015-01-01 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | cache | |||||
| * | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -1/+4 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | | | some small notation data fixes | Vincent Breitmoser | 2014-12-30 | 2 | -10/+10 | |
| | | | | | ||||||
| * | | | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 4 | -5/+27 | |
| | | | | | ||||||
| * | | | | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 3 | -14/+112 | |
| | | | | | | | | | | | | | | | | | | | | notation packet | |||||
* | | | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+1 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2014-12-29 | 1 | -53/+87 | |
|\| | | | | | | | | | | | | | | | development | |||||
| * | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 1 | -53/+87 | |
| | | | | | | | | | | | | | | | | capabilities | |||||
* | | | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -1/+6 | |
|/ / / | ||||||
* | / | Allow for creation date to be in the future up to one day to account for ↵ | Dominik Schürmann | 2014-12-28 | 1 | -4/+9 | |
| |/ |/| | | | | | diverging clocks on different systems for fresh keys | |||||
* | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 1 | -1/+1 | |
|/ | ||||||
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 1 | -0/+2 | |
| | ||||||
* | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -0/+4 | |
| | ||||||
* | Fail on unknown key ids on API, Key item design consistency for API | Dominik Schürmann | 2014-10-26 | 1 | -0/+14 | |
| | ||||||
* | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -4/+0 | |
| | ||||||
* | slightly change wording in merge logs | Vincent Breitmoser | 2014-10-25 | 1 | -0/+1 | |
| | ||||||
* | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -2/+2 | |
| | ||||||
* | Silently fail on import on key import with ArrayIndexOutOfBoundsException | Dominik Schürmann | 2014-10-16 | 1 | -5/+11 | |
| | ||||||
* | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 1 | -1/+0 | |
| | ||||||
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation | Vincent Breitmoser | 2014-10-13 | 2 | -56/+25 | |
| | ||||||
* | CertifyOperation is not a Pgp- operation | Vincent Breitmoser | 2014-10-12 | 1 | -6/+15 | |
| | ||||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 7 | -491/+12 | |
| | ||||||
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 3 | -52/+77 | |
| | ||||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2014-10-09 | 7 | -24/+63 | |
|\ | ||||||
| * | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 7 | -24/+63 | |
| | | ||||||
| * | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 6 | -37/+30 | |
| | | | | | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | |||||
| * | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 6 | -30/+37 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2014-10-09 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | yubikey: check with correct subkey id for sign operation | Vincent Breitmoser | 2014-10-04 | 1 | -1/+1 | |
| | | ||||||
* | | Remove unnecessary exception | Dominik Schürmann | 2014-10-08 | 2 | -9/+4 | |
| | | ||||||
* | | Big error screen if signature is invalid or key is revoked/expired, also ↵ | Dominik Schürmann | 2014-10-08 | 2 | -3/+19 | |
| | | | | | | | | fixes signature status for expired and revoked keys | |||||
* | | Move utf8 check for user id upwards | Dominik Schürmann | 2014-10-07 | 1 | -4/+5 | |
| | | ||||||
* | | Fix MSG_MF_UID_PRIMARY log | Dominik Schürmann | 2014-10-07 | 1 | -1/+1 | |
| | | ||||||
* | | use sub results in import | Vincent Breitmoser | 2014-10-05 | 1 | -2/+6 | |
| | | ||||||
* | | add support for second line in log view | Vincent Breitmoser | 2014-10-05 | 1 | -0/+3 | |
| | | ||||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 1 | -2/+12 | |
|\ \ | | | | | | | | | | into jacobshack-certify | |||||
| * | | Pass imported master key ids via result parcel | Dominik Schürmann | 2014-10-04 | 1 | -2/+12 | |
| | | | ||||||
* | | | certify: get rid of fingerprint check | Vincent Breitmoser | 2014-10-04 | 1 | -5/+0 | |
|/ / | | | | | | | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation. | |||||
* | | improve CertifyResult, add custom notify | Vincent Breitmoser | 2014-10-04 | 1 | -3/+5 | |
| | | ||||||
* | | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 4 | -5/+158 | |
|/ | ||||||
* | canonicalize: compare user ids as string rather than bytes | Vincent Breitmoser | 2014-10-04 | 1 | -3/+3 | |
| | ||||||
* | clean up PgpImportExport a bit | Vincent Breitmoser | 2014-10-03 | 1 | -7/+5 | |
| | ||||||
* | make getSignId a secret key operation, and respect unavailable keys | Vincent Breitmoser | 2014-10-02 | 5 | -64/+22 | |
| | | | | This one should remedy #811, but waiting for a test | |||||
* | Fix nullpointer with getS2K() | Dominik Schürmann | 2014-10-02 | 1 | -1/+2 | |
| |