aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Commit message (Expand)AuthorAgeFilesLines
...
* 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 enco...Dominik Schürmann2014-09-131-23/+26
* 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
* 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
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-281-2/+3
|\
| * 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 subke...Dominik Schürmann2014-08-271-9/+32
|/
* Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-211-0/+1
* fix travis tests (more), minor comment editsVincent Breitmoser2014-08-161-4/+3
* tests: add test for master key revocationVincent Breitmoser2014-08-161-2/+1
* fix subkey certification canonicalization (why did the test not catch this?!)Vincent Breitmoser2014-08-141-1/+1
* dem logixVincent Breitmoser2014-08-141-1/+1
* merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+3
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-0/+7
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-0/+4
* Dont write version header by defaultDominik Schürmann2014-08-141-1/+3
* Optimize importsDominik Schürmann2014-08-051-3/+1
* Add license headersDominik Schürmann2014-08-041-0/+17
* more fixes on canonicalization and progressVincent Breitmoser2014-07-311-17/+18
* fix fromStream method, properly recognize multiple concatenated streamsVincent Breitmoser2014-07-311-17/+20
* reduce memory usage while parsing multiple keyrings from a streamVincent Breitmoser2014-07-311-26/+65
* rename Wrapped*Key* to Canonicalized*Key*Vincent Breitmoser2014-07-311-34/+4
* Better exception handling for import of keysDominik Schürmann2014-07-311-5/+5
* watch out for nullpointers from get(Un|)HashedSubpacketsVincent Breitmoser2014-07-281-1/+2
* canonicalize: couple of fixesVincent Breitmoser2014-07-261-10/+30
* generic UncachedKeyRing fixesVincent Breitmoser2014-07-261-25/+24
* UncachedKeyRing.merge: copy over new secret subkeys into secret keyringsVincent Breitmoser2014-07-261-12/+9
* fixes for extractPublicKeyRing, update SpongyCastleVincent Breitmoser2014-07-261-6/+9
* canonicalize: fix for testsVincent Breitmoser2014-07-191-2/+6
* merge: different msg if nothing was mergedVincent Breitmoser2014-07-151-2/+6
* modifyKey: make SubkeyChange operations workVincent Breitmoser2014-07-111-0/+4
* fix bug in canonicalization regarding subkey revocationVincent Breitmoser2014-07-111-1/+1
* code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-52/+46
* canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-1/+3
* generate public keyring from secret if not availableVincent Breitmoser2014-06-181-0/+16
* consolidate: almost sane loggingVincent Breitmoser2014-06-181-1/+1
* consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-1/+22
* consolidate: make it workVincent Breitmoser2014-06-181-93/+99
* code cleanup in ProviderHelper and UncachedKeyRingVincent Breitmoser2014-06-181-26/+20
* consolidate: add loggingVincent Breitmoser2014-06-181-8/+29
* consolidate: first draftVincent Breitmoser2014-06-181-3/+114