aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'result-parcels'Vincent Breitmoser2014-09-132-194/+170
|\
| * some DecryptVerify log refinementsVincent Breitmoser2014-09-131-5/+13
| |
| * add a ton of logging to DecryptVerifyVincent Breitmoser2014-09-131-24/+88
| |
| * working version of DecryptVerifyResultVincent Breitmoser2014-09-131-6/+35
| |
| * introduce OperationResultParcel for PgpDecryptVerify operations (WIP)Vincent Breitmoser2014-09-132-210/+85
| |
* | 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-134-35/+64
| | | | | | | | encodings
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-134-14/+13
|\|
| * promote all result parcels to top level classes in their own packageVincent Breitmoser2014-09-134-14/+13
| |
* | getSignaturesForID can return null, check thisDominik Schürmann2014-09-132-119/+138
|/
* editKey: add support for sripping keysVincent Breitmoser2014-09-111-2/+26
|
* 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.
* add some comments to previous commitVincent Breitmoser2014-09-101-0/+1
|
* jury-rig broken sign mechanismVincent Breitmoser2014-09-091-10/+24
| | | | Should improve situation on #811
* Increase s2k count to 0x90Dominik Schürmann2014-09-091-4/+6
|
* Properly handle uneditable key types in EditKeyFragmentVincent Breitmoser2014-09-081-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 decryptionDominik Schürmann2014-09-082-17/+34
|
* Prepare Yubikey decryptionDominik Schürmann2014-09-082-26/+51
|
* Fix for user ids in APIDominik Schürmann2014-09-073-24/+29
|
* Due to compatiblity switch from SHA512 to SHA256Dominik Schürmann2014-09-071-1/+1
|
* Fix mAllowedKeyIdsDominik Schürmann2014-09-031-3/+3
|
* work on passphrase caching, make use of cached SecretKeyType data (WIP!)Vincent Breitmoser2014-09-031-9/+9
|
* If no key flags subpacket is present allow all key flags, fixes mailvelope keysDominik Schürmann2014-09-021-24/+47
|
* Remove version 3 checks, no longer supported in importDominik Schürmann2014-09-023-27/+24
|
* cache key s2k type in database, for later useVincent Breitmoser2014-09-022-13/+53
|
* remove broken(?) cancellation codeVincent Breitmoser2014-09-011-30/+0
|
* Experimental support for revoked, expired keys with signaturesDominik Schürmann2014-09-012-37/+67
|
* Prepare API for OpenPgpSignatureResult extensionsDominik Schürmann2014-08-311-3/+3
|
* Changelog 2.9Dominik Schürmann2014-08-311-1/+1
|
* add cancel prevention mechanism, improve cancellation for key importVincent Breitmoser2014-08-311-13/+15
|
* add cancel support to edit key actionVincent Breitmoser2014-08-311-0/+35
|
* Add cancelable mechanism and support in key importVincent Breitmoser2014-08-311-2/+21
| | | | Closes #323
* ditch NullProgressableVincent Breitmoser2014-08-301-36/+0
|
* 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
* Fix crash in PgpKeyHelperDominik Schürmann2014-08-281-1/+1
|
* Merge branch 'master' into yubikeyDominik Schürmann2014-08-2817-394/+784
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-286-65/+235
| |\ | | | | | | ECC support
| | * add ecc supportVincent Breitmoser2014-08-244-36/+230
| | |
| | * Fixing build with Spongy Castle 1.51Dominik Schürmann2014-08-212-30/+5
| | |
| * | 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
| * cleanupDominik Schürmann2014-08-211-71/+0
| |
| * Copyright (C) 2014 Vincent BreitmoserVincent Breitmoser2014-08-2112-2/+12
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-202-11/+3
| |\
| | * Upload key workingDominik Schürmann2014-08-202-11/+3
| | |
| * | make number of secret keys imported part of ImportResult parcelVincent Breitmoser2014-08-201-3/+6
| |/