Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -1/+3 |
| | |||||
* | reject keys with duplicate subkeys altogether | Vincent Breitmoser | 2014-09-23 | 1 | -1/+15 |
| | | | | closes #870 | ||||
* | add test case for duplicate keys in keyring (#870) | Vincent Breitmoser | 2014-09-23 | 2 | -4/+4 |
| | |||||
* | Feature to change key configuration in create key | Dominik Schürmann | 2014-09-21 | 1 | -1/+0 |
| | |||||
* | Add null check to getSecretKeyType | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 |
| | |||||
* | fix isLocal logic (f*ck yeah unit tests!) | Vincent Breitmoser | 2014-09-20 | 1 | -1/+1 |
| | |||||
* | respect user id revocation signatures | Vincent Breitmoser | 2014-09-20 | 1 | -1/+14 |
| | | | | Closes #836 | ||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -0/+2 |
| | |||||
* | Fixes for nfc decrypt | Dominik Schürmann | 2014-09-18 | 1 | -2/+1 |
| | |||||
* | Fix nfc signing | Dominik Schürmann | 2014-09-18 | 1 | -1/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 7 | -361/+31 |
| | | | | created ui.util for everything related to formatting | ||||
* | Fix cleartext verify | Dominik Schürmann | 2014-09-17 | 1 | -2/+10 |
| | |||||
* | fix encrypt/decrypt classes | Vincent Breitmoser | 2014-09-17 | 1 | -3/+0 |
| | |||||
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 3 | -31/+55 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 2 | -5/+8 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml | ||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 5 | -19/+19 |
| |\ | |||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 2 | -5/+8 |
| | | | | | | | | | | | | non-decodable characters) | ||||
* | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 5 | -187/+182 |
| |/ |/| | |||||
* | | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 5 | -19/+18 |
| | | |||||
* | | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 1 | -0/+1 |
|/ | |||||
* | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 1 | -163/+179 |
| | |||||
* | add key id to trailing asym data log msg | Vincent Breitmoser | 2014-09-13 | 1 | -3/+6 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 1 | -0/+4 |
|\ | |||||
| * | very small fix, don't show name on encoding warning | Vincent Breitmoser | 2014-09-13 | 1 | -2/+1 |
| | | |||||
| * | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 1 | -0/+5 |
| | | |||||
* | | Set literal data format tag to UTF8 when encrypting text | Dominik Schürmann | 2014-09-13 | 1 | -1/+7 |
|/ | |||||
* | Merge branch 'result-parcels' | Vincent Breitmoser | 2014-09-13 | 2 | -194/+170 |
|\ | |||||
| * | some DecryptVerify log refinements | Vincent Breitmoser | 2014-09-13 | 1 | -5/+13 |
| | | |||||
| * | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 1 | -24/+88 |
| | | |||||
| * | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 1 | -6/+35 |
| | | |||||
| * | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 2 | -210/+85 |
| | | |||||
* | | Test for badly encoded user ids | Dominik Schürmann | 2014-09-13 | 1 | -0/+1 |
| | | |||||
* | | Get certificates by raw user ids, be more liberal about accepted user id ↵ | Dominik Schürmann | 2014-09-13 | 4 | -35/+64 |
| | | | | | | | | encodings | ||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 4 | -14/+13 |
|\| | |||||
| * | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 4 | -14/+13 |
| | | |||||
* | | getSignaturesForID can return null, check this | Dominik Schürmann | 2014-09-13 | 2 | -119/+138 |
|/ | |||||
* | editKey: add support for sripping keys | Vincent Breitmoser | 2014-09-11 | 1 | -2/+26 |
| | |||||
* | merge: add support for s2k dummy generation | Vincent Breitmoser | 2014-09-11 | 1 | -23/+3 |
| | | | | | | if a public key gets merged into a secret one, and there are new subkeys, the merge() routine now adds a newly generated, stripped secret subkey instead. | ||||
* | add some comments to previous commit | Vincent Breitmoser | 2014-09-10 | 1 | -0/+1 |
| | |||||
* | jury-rig broken sign mechanism | Vincent Breitmoser | 2014-09-09 | 1 | -10/+24 |
| | | | | Should improve situation on #811 | ||||
* | Increase s2k count to 0x90 | Dominik Schürmann | 2014-09-09 | 1 | -4/+6 |
| | |||||
* | Properly handle uneditable key types in EditKeyFragment | Vincent Breitmoser | 2014-09-08 | 1 | -0/+4 |
| | | | | | | | More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828 | ||||
* | Work on Yubikey decryption | Dominik Schürmann | 2014-09-08 | 2 | -17/+34 |
| | |||||
* | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 2 | -26/+51 |
| | |||||
* | Fix for user ids in API | Dominik Schürmann | 2014-09-07 | 3 | -24/+29 |
| | |||||
* | Due to compatiblity switch from SHA512 to SHA256 | Dominik Schürmann | 2014-09-07 | 1 | -1/+1 |
| | |||||
* | Fix mAllowedKeyIds | Dominik Schürmann | 2014-09-03 | 1 | -3/+3 |
| | |||||
* | work on passphrase caching, make use of cached SecretKeyType data (WIP!) | Vincent Breitmoser | 2014-09-03 | 1 | -9/+9 |
| | |||||
* | If no key flags subpacket is present allow all key flags, fixes mailvelope keys | Dominik Schürmann | 2014-09-02 | 1 | -24/+47 |
| | |||||
* | Remove version 3 checks, no longer supported in import | Dominik Schürmann | 2014-09-02 | 3 | -27/+24 |
| |