aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Collapse)AuthorAgeFilesLines
* added revocation tag NO_REASON to all revocations via PgpKeyOperationAdithya Abraham Philip2015-07-141-0/+7
|
* added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-132-3/+0
|
* allowed operations to modify CryptoInputParcel they receiveAdithya Abraham Philip2015-07-133-9/+12
|
* implemented revocation on deletionAdithya Abraham Philip2015-07-131-1/+4
|
* fix symmetric passphrase caching (fixes #1401)Vincent Breitmoser2015-07-081-6/+26
|
* fix result type for divert-to-card new subkey errorVincent Breitmoser2015-07-081-1/+1
|
* addition of subkeys for divert-to-card primary keys is not supportedVincent Breitmoser2015-07-081-2/+6
|
* better handling of divert-to-card keys for subkey modificationsVincent Breitmoser2015-07-081-27/+48
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-07-071-1/+1
|\
| * tests: make sure encryption happens to all enc-capable subkeysVincent Breitmoser2015-07-071-1/+1
| |
* | Simplify getLineSeparator in PgpDecryptVerifyDominik Schürmann2015-07-071-7/+1
|/
* also catch DecoderException in decryptverifyVincent Breitmoser2015-07-061-2/+3
|
* encrypt to all encryption subkeys, rather than just the firstVincent Breitmoser2015-07-063-22/+27
|
* catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown ↵Vincent Breitmoser2015-07-061-0/+7
| | | | from BouncyCastle
* forgot a couple lines to commitVincent Breitmoser2015-07-061-0/+10
|
* nicer error msg if input data cannot be readVincent Breitmoser2015-07-061-3/+3
|
* cleanup, NonNull annotation, never return null in PgpDecryptVerifyVincent Breitmoser2015-07-061-14/+22
|
* removed e.printStackTrace from several placesAdithya Abraham Philip2015-07-031-1/+1
|
* Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-021-0/+20
|
* Use proper length and mod time for cleartext signature metadataDominik Schürmann2015-06-291-2/+2
|
* Return metadata for cleartext sigsDominik Schürmann2015-06-291-0/+7
|
* Guess mime type like support libs FileProviderDominik Schürmann2015-06-291-7/+1
|
* Merge remote-tracking branch 'origin/master' into v/multi-decryptVincent Breitmoser2015-06-261-1/+1
|\
| * fixed fingerprint mismatch issueAdithya Abraham Philip2015-06-251-1/+1
| |
* | working DisplayTextActivity, more input support in DecryptActivityVincent Breitmoser2015-06-201-3/+70
| |
* | Merge branch 'v/instrument' into v/multi-decryptVincent Breitmoser2015-06-172-21/+8
|\| | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| * fix filesize reporting in decrypt operationVincent Breitmoser2015-06-171-0/+6
| |
| * fix returned text of cleartext verifyVincent Breitmoser2015-06-171-4/+5
| |
| * fix recursive log in modifySecretKeyRingVincent Breitmoser2015-06-171-7/+2
| |
* | WIP! Merge branch 'v/eventbus' into v/multi-decryptVincent Breitmoser2015-06-072-9/+1
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
| * eventbus: initial attempt, replace messenger hack with eventbus communicationVincent Breitmoser2015-06-062-9/+1
| |
* | multi-decrypt: working in principleVincent Breitmoser2015-06-021-16/+32
| |
* | introduce CachingDataDecryptorFactory towards cached session keysVincent Breitmoser2015-06-012-28/+33
|/ | | | | | | | this commit introduces the CachingDataDecryptorFactory, which wraps a DataDecryptorFactory but supports caching of decrypted session keys. this change also gets rid of runtimeexception based control flow in PgpDecryptVerify.
* only promote subkeys which are actually presentVincent Breitmoser2015-05-301-8/+5
|
* rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcelVincent Breitmoser2015-05-302-126/+237
|
* better error handling for bad encrypted data checksumVincent Breitmoser2015-05-301-1/+7
|
* rewrite data flow in EncryptFileFragment preserve state correctlyVincent Breitmoser2015-05-301-0/+4
|
* make KeyItem serializble, for state in TokenTextCompleteViewVincent Breitmoser2015-05-301-1/+2
|
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-284-12/+16
|\ | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml
| * improve robustness of SecretKeyType handlingVincent Breitmoser2015-05-282-8/+10
| |
| * set to stripped by default, rather than "unavailable"Vincent Breitmoser2015-05-281-3/+3
| |
| * make masterKeyId and subKeyId strictly required in CryptoInputParcelVincent Breitmoser2015-05-282-1/+3
| |
| * fix merge problems (derp)Vincent Breitmoser2015-05-281-4/+2
| |
* | Merge branch 'master' into developmentVincent Breitmoser2015-05-281-13/+20
|\| | | | | | | | | Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * create keys with fixed timestampVincent Breitmoser2015-05-281-6/+8
| |
| * warn on signature earlier than key creation, err on significantly earlierVincent Breitmoser2015-05-281-0/+21
| |
| * don't show allowed key list if no key exists, and some minor ↵Vincent Breitmoser2015-05-281-13/+24
| | | | | | | | PgpDecryptVerify changes
| * add user id flags to UserAttribute self signaturesVincent Breitmoser2015-05-201-13/+20
| |
| * apply promote operation to specific subkeys present on yubikey onlyVincent Breitmoser2015-05-172-3/+21
| |
* | create keys with fixed timestampVincent Breitmoser2015-05-281-5/+7
| |