Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-15 | 1 | -4/+3 |
|\ | |||||
| * | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -4/+3 |
| | | |||||
* | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 1 | -2/+3 |
|/ | | | | non-decodable characters) | ||||
* | 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 |
| | |||||
* | 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 | 1 | -23/+26 |
| | | | | encodings | ||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-09-13 | 1 | -3/+3 |
|\ | |||||
| * | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -3/+3 |
| | | |||||
* | | getSignaturesForID can return null, check this | Dominik Schürmann | 2014-09-13 | 1 | -107/+114 |
|/ | |||||
* | 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. | ||||
* | fix one log level | Vincent Breitmoser | 2014-08-30 | 1 | -1/+1 |
| | |||||
* | get rid of a deprecated method use | Vincent Breitmoser | 2014-08-30 | 1 | -1/+2 |
| | |||||
* | canonicalize: add check for algorithm type | Vincent Breitmoser | 2014-08-30 | 1 | -2/+32 |
| | | | | closes #797 | ||||
* | Merge pull request #796 from open-keychain/develop | Dominik Schürmann | 2014-08-28 | 1 | -2/+3 |
|\ | | | | | ECC support | ||||
| * | add ecc support | Vincent Breitmoser | 2014-08-24 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-27 | 1 | -7/+7 |
|\ \ | |||||
| * | | small language fixes for previous commit | Vincent Breitmoser | 2014-08-27 | 1 | -8/+7 |
| | | | |||||
* | | | Strip out duplicate user ids | Dominik Schürmann | 2014-08-27 | 1 | -3/+13 |
|/ / | |||||
* / | Abort import of pubkeys where secret keys exist but new pubkey has more ↵ | Dominik Schürmann | 2014-08-27 | 1 | -9/+32 |
|/ | | | | subkeys, fix #696 | ||||
* | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
| | |||||
* | fix travis tests (more), minor comment edits | Vincent Breitmoser | 2014-08-16 | 1 | -4/+3 |
| | |||||
* | tests: add test for master key revocation | Vincent Breitmoser | 2014-08-16 | 1 | -2/+1 |
| | |||||
* | fix subkey certification canonicalization (why did the test not catch this?!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | dem logix | Vincent Breitmoser | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | merge: check fingerprints on merge operation! (this needs a testcase!) | Vincent Breitmoser | 2014-08-14 | 1 | -1/+3 |
| | |||||
* | move v3 key import prevention into canonicalization method | Dominik Schürmann | 2014-08-14 | 1 | -0/+7 |
| | |||||
* | Do not import v3 keys, they are insecure! | Dominik Schürmann | 2014-08-14 | 1 | -0/+4 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+3 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -3/+1 |
| | |||||
* | Add license headers | Dominik Schürmann | 2014-08-04 | 1 | -0/+17 |
| | |||||
* | more fixes on canonicalization and progress | Vincent Breitmoser | 2014-07-31 | 1 | -17/+18 |
| | |||||
* | fix fromStream method, properly recognize multiple concatenated streams | Vincent Breitmoser | 2014-07-31 | 1 | -17/+20 |
| | |||||
* | reduce memory usage while parsing multiple keyrings from a stream | Vincent Breitmoser | 2014-07-31 | 1 | -26/+65 |
| | |||||
* | rename Wrapped*Key* to Canonicalized*Key* | Vincent Breitmoser | 2014-07-31 | 1 | -34/+4 |
| | |||||
* | Better exception handling for import of keys | Dominik Schürmann | 2014-07-31 | 1 | -5/+5 |
| | |||||
* | watch out for nullpointers from get(Un|)HashedSubpackets | Vincent Breitmoser | 2014-07-28 | 1 | -1/+2 |
| | | | | fixes #721 | ||||
* | canonicalize: couple of fixes | Vincent Breitmoser | 2014-07-26 | 1 | -10/+30 |
| | |||||
* | generic UncachedKeyRing fixes | Vincent Breitmoser | 2014-07-26 | 1 | -25/+24 |
| | |||||
* | UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings | Vincent Breitmoser | 2014-07-26 | 1 | -12/+9 |
| | |||||
* | fixes for extractPublicKeyRing, update SpongyCastle | Vincent Breitmoser | 2014-07-26 | 1 | -6/+9 |
| | |||||
* | canonicalize: fix for tests | Vincent Breitmoser | 2014-07-19 | 1 | -2/+6 |
| | |||||
* | merge: different msg if nothing was merged | Vincent Breitmoser | 2014-07-15 | 1 | -2/+6 |
| | |||||
* | modifyKey: make SubkeyChange operations work | Vincent Breitmoser | 2014-07-11 | 1 | -0/+4 |
| | |||||
* | fix bug in canonicalization regarding subkey revocation | Vincent Breitmoser | 2014-07-11 | 1 | -1/+1 |
| | |||||
* | code cleanup and plurals in import log entries | Vincent Breitmoser | 2014-06-28 | 1 | -52/+46 |
| | | | | closes #698 | ||||
* | canonicalize: missed two logging entries | Vincent Breitmoser | 2014-06-18 | 1 | -1/+3 |
| | |||||
* | generate public keyring from secret if not available | Vincent Breitmoser | 2014-06-18 | 1 | -0/+16 |
| | |||||
* | consolidate: almost sane logging | Vincent Breitmoser | 2014-06-18 | 1 | -1/+1 |
| | |||||
* | consolidate: add key import routines with consolidation | Vincent Breitmoser | 2014-06-18 | 1 | -1/+22 |
| |