aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Commit message (Collapse)AuthorAgeFilesLines
* lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-251-7/+7
|
* work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-251-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-cardVincent Breitmoser2015-01-241-1/+3
|
* add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
|
* add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-121-0/+166
|
* get rid of RuntimeException control flow in UncachedKeyRing.fromStreamVincent Breitmoser2015-01-021-25/+17
|
* fix and test for bad certificate version numbers (#1012)Vincent Breitmoser2015-01-021-7/+13
| | | | closes #1012
* extend canonicalize to strip local certificates on exportVincent Breitmoser2015-01-021-8/+45
|
* some small notation data fixesVincent Breitmoser2014-12-301-8/+6
|
* introduce handling of notation direct key signatures, and experimental pin ↵Vincent Breitmoser2014-12-301-11/+48
| | | | notation packet
* Allow for creation date to be in the future up to one day to account for ↵Dominik Schürmann2014-12-281-4/+9
| | | | diverging clocks on different systems for fresh keys
* Minor code cleanupDominik Schürmann2014-11-211-1/+1
|
* implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-261-0/+4
|
* remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-251-4/+0
|
* slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
|
* change the way merging is loggedVincent Breitmoser2014-10-251-2/+2
|
* Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-161-5/+11
|
* move around package structure a bitVincent Breitmoser2014-10-101-2/+2
|
* Move utf8 check for user id upwardsDominik Schürmann2014-10-071-4/+5
|
* canonicalize: compare user ids as string rather than bytesVincent Breitmoser2014-10-041-3/+3
|
* fix minor logic error (haha)Vincent Breitmoser2014-09-301-1/+1
|
* move can.*() methods to CanonicalizedPublicKey, where they belongVincent Breitmoser2014-09-281-5/+4
|
* be more mindful of algorithm and usage flag interactionVincent Breitmoser2014-09-281-2/+38
| | | | Fixes #895
* only check for primary binding certificate if key algorithm even supports ↵Vincent Breitmoser2014-09-281-9/+15
| | | | signing
* Reject subkeys with no key flags and no primary key binding certificateVincent Breitmoser2014-09-281-27/+35
| | | | Closes #899
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-231-1/+15
| | | | closes #870
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-171-7/+7
| | | | created ui.util for everything related to formatting
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-151-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-keychainDominik Schürmann2014-09-151-4/+3
| |\
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-151-2/+3
| | | | | | | | | | | | non-decodable characters)
* | | move LogLevel info into LogType enumVincent Breitmoser2014-09-151-56/+55
| |/ |/|
* | work on OperationResultParcelVincent Breitmoser2014-09-141-4/+3
|/
* very small fix, don't show name on encoding warningVincent Breitmoser2014-09-131-2/+1
|
* log warning on bad uid encodingVincent Breitmoser2014-09-131-0/+5
|
* Test for badly encoded user idsDominik Schürmann2014-09-131-0/+1
|
* Get certificates by raw user ids, be more liberal about accepted user id ↵Dominik Schürmann2014-09-131-23/+26
| | | | encodings
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-131-3/+3
|\
| * promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-131-3/+3
| |
* | getSignaturesForID can return null, check thisDominik Schürmann2014-09-131-107/+114
|/
* merge: add support for s2k dummy generationVincent Breitmoser2014-09-111-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 levelVincent Breitmoser2014-08-301-1/+1
|
* get rid of a deprecated method useVincent Breitmoser2014-08-301-1/+2
|
* canonicalize: add check for algorithm typeVincent Breitmoser2014-08-301-2/+32
| | | | closes #797
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-281-2/+3
|\ | | | | ECC support
| * add ecc supportVincent Breitmoser2014-08-241-3/+3
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-271-7/+7
|\ \
| * | small language fixes for previous commitVincent Breitmoser2014-08-271-8/+7
| | |
* | | Strip out duplicate user idsDominik Schürmann2014-08-271-3/+13
|/ /
* / Abort import of pubkeys where secret keys exist but new pubkey has more ↵Dominik Schürmann2014-08-271-9/+32
|/ | | | subkeys, fix #696
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
|