| Commit message (Expand) | Author | Age | Files | Lines |
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+4 |
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 6 | -96/+321 |
|\ |
|
| * | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 2 | -6/+30 |
| |\ |
|
| | * | add ecc support | Vincent Breitmoser | 2014-08-24 | 2 | -6/+30 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 1 | -3/+3 |
| |\ \ |
|
| | * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 1 | -3/+3 |
| * | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
| |/ / |
|
| * / | Abort import of pubkeys where secret keys exist but new pubkey has more subke... | Dominik Schürmann | 2014-08-27 | 1 | -0/+1 |
| |/ |
|
| * | Change account type | Dominik Schürmann | 2014-08-21 | 2 | -5/+5 |
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-21 | 2 | -38/+62 |
| |\ |
|
| | * | Comment extra in requestSync | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | * | Sync in KeychainIntentService on delete, import, save | Dominik Schürmann | 2014-08-20 | 2 | -0/+21 |
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 2 | -3/+54 |
| | |\ |
|
| | * | | Enable sync adapter, changelog | Dominik Schürmann | 2014-08-20 | 1 | -0/+1 |
| | * | | Disable key import in sync adapter | Dominik Schürmann | 2014-08-20 | 1 | -38/+39 |
| * | | | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 4 | -0/+4 |
| | |/
| |/| |
|
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -2/+3 |
| |\| |
|
| | * | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -2/+3 |
| * | | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -1/+49 |
| * | | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -5/+2 |
| |\| |
|
| | * | Notify duration, cleanup | Dominik Schürmann | 2014-08-20 | 1 | -5/+2 |
| * | | make number of secret keys imported part of ImportResult parcel | Vincent Breitmoser | 2014-08-20 | 1 | -2/+5 |
| |/ |
|
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 2 | -3/+3 |
| |\ |
|
| | * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -3/+10 |
| | |\ |
|
| | * | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 2 | -3/+3 |
| * | | | consolidate: prevent concurrent calls of step 2 | Vincent Breitmoser | 2014-08-20 | 1 | -0/+1 |
| | |/
| |/| |
|
| * | | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -3/+10 |
| |/ |
|
| * | Fix strings | Dominik Schürmann | 2014-08-19 | 1 | -2/+2 |
| * | consolidate: a lot more log output, better recovery | Vincent Breitmoser | 2014-08-19 | 1 | -5/+20 |
| * | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 2 | -10/+4 |
| * | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 3 | -0/+32 |
| * | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+1 |
| * | modify*Key: improve handling of passphrase modification (add tests, too) | Vincent Breitmoser | 2014-08-16 | 1 | -0/+4 |
| * | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 1 | -1/+6 |
| * | Fix and simplify in OperationResultParcel | Dominik Schürmann | 2014-08-16 | 1 | -11/+7 |
| * | typed expected failures and a couple minor things | Vincent Breitmoser | 2014-08-16 | 1 | -2/+3 |
| * | support for master key modifications, among other stuff | Vincent Breitmoser | 2014-08-16 | 1 | -1/+12 |
| * | modifySecretKey: err out on "use previous" expiry date for (sub)key creation | Vincent Breitmoser | 2014-08-16 | 1 | -0/+2 |
| * | modifySecretKey: err out on revocation of nonexistent user id | Vincent Breitmoser | 2014-08-16 | 1 | -0/+1 |
| * | Fix encrypt only | Dominik Schürmann | 2014-08-16 | 2 | -18/+22 |
| * | fix keys with no expiry in ui code | Vincent Breitmoser | 2014-08-14 | 1 | -2/+7 |
| * | Pass through of master key id in SaveKeyringResult | Dominik Schürmann | 2014-08-14 | 1 | -4/+33 |
| * | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+22 |
| * | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| * | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -0/+1 |
| * | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-14 | 2 | -55/+144 |
|\| |
|
| * | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| * | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 2 | -49/+72 |
| * | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 1 | -1/+1 |