| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 1 | -6/+6 |
| |\ | |||||
| | * | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 1 | -6/+6 |
| | | | |||||
| * | | performance: avoid expensive getSecretKeyType call, use cached where possible | Vincent Breitmoser | 2016-02-05 | 1 | -14/+0 |
| |/ | |||||
| * | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 1 | -2/+2 |
| | | |||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -11/+3 |
| | | |||||
| * | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -0/+14 |
| | | |||||
| * | make getSignId a secret key operation, and respect unavailable keys | Vincent Breitmoser | 2014-10-02 | 1 | -35/+12 |
| | | | | | This one should remedy #811, but waiting for a test | ||||
| * | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -13/+0 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -1/+17 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| | * | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -1/+0 |
| | | | |||||
| | * | Add license headers | Dominik Schürmann | 2014-08-04 | 1 | -0/+17 |
| | | | |||||
| * | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-01 | 1 | -2/+2 |
| |/ | | | | | | | | 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/+152 |
 |
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/CanonicalizedSecretKeyRing.java