Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix crash in PgpKeyHelper | Dominik Schürmann | 2014-08-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-28 | 1 | -10/+121 |
|\ | | | | | | | | | | | | | 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 | ||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -10/+121 |
| | | |||||
* | | Merge branch 'master' into yubikey | Dominik Schürmann | 2014-08-06 | 1 | -15/+11 |
|\| | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java extern/openpgp-api-lib settings.gradle | ||||
| * | Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry ↵ | Dominik Schürmann | 2014-08-05 | 1 | -13/+9 |
| | | | | | | | | selection for adding new subkeys | ||||
| * | Fixing lint complaints, removing unused resources | Dominik Schürmann | 2014-08-04 | 1 | -2/+2 |
| | | |||||
* | | NFC Yubikey: only pass through hash of message and not whole content | Dominik Schürmann | 2014-07-21 | 1 | -1/+1 |
|/ | |||||
* | Fix keybase import | Dominik Schürmann | 2014-06-20 | 1 | -1/+1 |
| | |||||
* | neatness refactoring | Vincent Breitmoser | 2014-06-04 | 1 | -165/+0 |
| | |||||
* | wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing | Vincent Breitmoser | 2014-05-21 | 1 | -3/+0 |
| | |||||
* | wrapped-key-ring: remove more unneeded methods | Vincent Breitmoser | 2014-05-04 | 1 | -91/+0 |
| | |||||
* | wrapped-key-ring: more work on passphrase caching and certification | Vincent Breitmoser | 2014-05-04 | 1 | -17/+0 |
| | |||||
* | wrapped-key-ring: more refactoring - no more pgp imports in ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -54/+0 |
| | | | | KeychainIntentService! | ||||
* | wrapped-key-ring: move more helper methods into keys | Vincent Breitmoser | 2014-05-03 | 1 | -0/+1 |
| | |||||
* | certification is always done with the master key | Vincent Breitmoser | 2014-05-03 | 1 | -55/+0 |
| | |||||
* | wrapped-key-ring: first steps, get rid of key imports in decryptverify and ↵ | Vincent Breitmoser | 2014-05-03 | 1 | -30/+18 |
| | | | | signencrypt | ||||
* | More code cleanup | Dominik Schürmann | 2014-04-19 | 1 | -6/+31 |
| | |||||
* | get rid of PgpKeyHelper.getMasterKeyId | Vincent Breitmoser | 2014-04-17 | 1 | -24/+0 |
| | | | | Closes #575 | ||||
* | NotFoundExceptions for all getGeneric-type methods | Vincent Breitmoser | 2014-04-17 | 1 | -8/+0 |
| | |||||
* | Fix PgpDecryptVerify signature verification: search for right signature ↵ | Dominik Schürmann | 2014-04-15 | 1 | -33/+34 |
| | | | | subkey instead of using first subkey for verification | ||||
* | Clarify use of methods in PgpKeyHelper | Dominik Schürmann | 2014-04-11 | 1 | -3/+3 |
| | |||||
* | Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested) | Dominik Schürmann | 2014-04-11 | 1 | -30/+5 |
| | |||||
* | Use NotFoundException in more places | Dominik Schürmann | 2014-04-08 | 1 | -7/+18 |
| | |||||
* | Change license from ASLv2 to GPLv3 where possible | Thialfihar | 2014-04-08 | 1 | -9/+10 |
| | |||||
* | Update copyright timespan for Thialfihar | Thialfihar | 2014-04-08 | 1 | -1/+1 |
| | |||||
* | Rename folder structure from OpenPGP Keychain to OpenKeychain | Dominik Schürmann | 2014-04-06 | 1 | -0/+644 |