Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -7/+7 |
| | |||||
* | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -3/+1 |
| | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 1 | -1/+3 |
| | |||||
* | add support for user attributes in merge() routine | Vincent Breitmoser | 2015-01-13 | 1 | -2/+28 |
| | |||||
* | add support for user attributes (during canonicalization) | Vincent Breitmoser | 2015-01-12 | 1 | -0/+166 |
| | |||||
* | get rid of RuntimeException control flow in UncachedKeyRing.fromStream | Vincent Breitmoser | 2015-01-02 | 1 | -25/+17 |
| | |||||
* | fix and test for bad certificate version numbers (#1012) | Vincent Breitmoser | 2015-01-02 | 1 | -7/+13 |
| | | | | closes #1012 | ||||
* | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 1 | -8/+45 |
| | |||||
* | some small notation data fixes | Vincent Breitmoser | 2014-12-30 | 1 | -8/+6 |
| | |||||
* | introduce handling of notation direct key signatures, and experimental pin ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -11/+48 |
| | | | | notation packet | ||||
* | Allow for creation date to be in the future up to one day to account for ↵ | Dominik Schürmann | 2014-12-28 | 1 | -4/+9 |
| | | | | diverging clocks on different systems for fresh keys | ||||
* | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 1 | -1/+1 |
| | |||||
* | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -0/+4 |
| | |||||
* | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -4/+0 |
| | |||||
* | slightly change wording in merge logs | Vincent Breitmoser | 2014-10-25 | 1 | -0/+1 |
| | |||||
* | change the way merging is logged | Vincent Breitmoser | 2014-10-25 | 1 | -2/+2 |
| | |||||
* | Silently fail on import on key import with ArrayIndexOutOfBoundsException | Dominik Schürmann | 2014-10-16 | 1 | -5/+11 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -2/+2 |
| | |||||
* | Move utf8 check for user id upwards | Dominik Schürmann | 2014-10-07 | 1 | -4/+5 |
| | |||||
* | canonicalize: compare user ids as string rather than bytes | Vincent Breitmoser | 2014-10-04 | 1 | -3/+3 |
| | |||||
* | fix minor logic error (haha) | Vincent Breitmoser | 2014-09-30 | 1 | -1/+1 |
| | |||||
* | move can.*() methods to CanonicalizedPublicKey, where they belong | Vincent Breitmoser | 2014-09-28 | 1 | -5/+4 |
| | |||||
* | be more mindful of algorithm and usage flag interaction | Vincent Breitmoser | 2014-09-28 | 1 | -2/+38 |
| | | | | Fixes #895 | ||||
* | only check for primary binding certificate if key algorithm even supports ↵ | Vincent Breitmoser | 2014-09-28 | 1 | -9/+15 |
| | | | | signing | ||||
* | Reject subkeys with no key flags and no primary key binding certificate | Vincent Breitmoser | 2014-09-28 | 1 | -27/+35 |
| | | | | Closes #899 | ||||
* | reject keys with duplicate subkeys altogether | Vincent Breitmoser | 2014-09-23 | 1 | -1/+15 |
| | | | | closes #870 | ||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -7/+7 |
| | | | | created ui.util for everything related to formatting | ||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 1 | -2/+3 |
|\ | | | | | | | | | | | 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 | 1 | -4/+3 |
| |\ | |||||
| * | | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵ | Dominik Schürmann | 2014-09-15 | 1 | -2/+3 |
| | | | | | | | | | | | | non-decodable characters) | ||||
* | | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 1 | -56/+55 |
| |/ |/| | |||||
* | | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -4/+3 |
|/ | |||||
* | 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 |
| |