aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
* use correct pin for nfc in EncryptActivityVincent Breitmoser2014-09-241-1/+1
|
* fix signatures produced by yubikeyVincent Breitmoser2014-09-241-12/+15
| | | | | | | | The timestamp was only set on a second run. This led to a race condition whether the signature could be completed within the same timestamp. Fixes #834
* passphrasecache: cache by master key, introduce preference for cache by subkeyVincent Breitmoser2014-09-231-1/+3
|
* reject keys with duplicate subkeys altogetherVincent Breitmoser2014-09-231-1/+15
| | | | closes #870
* add test case for duplicate keys in keyring (#870)Vincent Breitmoser2014-09-232-4/+4
|
* Feature to change key configuration in create keyDominik Schürmann2014-09-211-1/+0
|
* Add null check to getSecretKeyTypeDominik Schürmann2014-09-211-1/+1
|
* fix isLocal logic (f*ck yeah unit tests!)Vincent Breitmoser2014-09-201-1/+1
|
* respect user id revocation signaturesVincent Breitmoser2014-09-201-1/+14
| | | | Closes #836
* Use key icons in import, prettify itemsDominik Schürmann2014-09-181-0/+2
|
* Fixes for nfc decryptDominik Schürmann2014-09-181-2/+1
|
* Fix nfc signingDominik Schürmann2014-09-181-1/+1
|
* package reordering: merge util and helper, there were no real difference; ↵Dominik Schürmann2014-09-177-361/+31
| | | | created ui.util for everything related to formatting
* Fix cleartext verifyDominik Schürmann2014-09-171-2/+10
|
* fix encrypt/decrypt classesVincent Breitmoser2014-09-171-3/+0
|
* Work on new result handling (WIP)Dominik Schürmann2014-09-173-31/+55
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-09-152-5/+8
|\ | | | | | | | | | | 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-155-19/+19
| |\
| * | New decrypt activity design (WIP), saner UTF8 decoding (replacing ↵Dominik Schürmann2014-09-152-5/+8
| | | | | | | | | | | | non-decodable characters)
* | | move LogLevel info into LogType enumVincent Breitmoser2014-09-155-187/+182
| |/ |/|
* | work on OperationResultParcelVincent Breitmoser2014-09-145-19/+18
| |
* | pending results are a type of non-successVincent Breitmoser2014-09-141-0/+1
|/
* add SignEncryptResult parcel (probably break stuff)Vincent Breitmoser2014-09-141-163/+179
|
* add key id to trailing asym data log msgVincent Breitmoser2014-09-131-3/+6
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-09-131-0/+4
|\
| * 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
| |
* | Set literal data format tag to UTF8 when encrypting textDominik Schürmann2014-09-131-1/+7
|/
* 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
|