Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | make constant for certify hash algo | Dominik Schürmann | 2015-03-11 | 1 | -11/+4 |
| | |||||
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -4/+68 |
| | |||||
* | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 1 | -1/+2 |
| | |||||
* | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 1 | -6/+1 |
| | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -37/+5 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 1 | -10/+28 |
| | |||||
* | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 1 | -4/+2 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -4/+2 |
| | | |||||
* | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 1 | -1/+1 |
|/ | |||||
* | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 1 | -6/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 1 | -0/+12 |
|\ | | | | | | | development | ||||
| * | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 1 | -0/+6 |
| | | |||||
| * | 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 | ||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -1/+9 |
| | | | |||||
* | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+1 |
| |/ |/| | |||||
* | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -1/+6 |
|/ | |||||
* | CertifyOperation is not a Pgp- operation | Vincent Breitmoser | 2014-10-12 | 1 | -6/+15 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -1/+4 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -4/+1 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -1/+4 |
| | |||||
* | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 1 | -4/+5 |
| | |||||
* | Fix nullpointer with getS2K() | Dominik Schürmann | 2014-10-02 | 1 | -1/+2 |
| | |||||
* | fix signatures produced by yubikey | Vincent Breitmoser | 2014-09-24 | 1 | -12/+15 |
| | | | | | | | | The timestamp was only set on a second run. This led to a race condition whether the signature could be completed within the same timestamp. Fixes #834 | ||||
* | add test case for duplicate keys in keyring (#870) | Vincent Breitmoser | 2014-09-23 | 1 | -3/+3 |
| | |||||
* | Add null check to getSecretKeyType | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 |
| | |||||
* | Work on Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -10/+16 |
| | |||||
* | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -23/+34 |
| | |||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -0/+53 |
| | |||||
* | Changelog 2.9 | Dominik Schürmann | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| | | |||||
* | | Support for multiple hash algos | Dominik Schürmann | 2014-08-14 | 1 | -11/+21 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -0/+17 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | Add license headers | Dominik Schürmann | 2014-08-04 | 1 | -0/+17 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -37/+84 |
|/ | | | | | | | | Conflicts: .gitmodules OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | ||||
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -0/+192 |