| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java