Commit Graph
512 Commits
Author SHA1 Message Date
Dominik Schürmann 7a98ffc90a Remove dead code 2015-08-27 12:34:54 +02:00
Vincent Breitmoser 3c8028fc88 apply fixPgpMessage to plaintext/armored decrypt input 2015-08-17 12:38:46 +02:00
Dominik Schürmann bc18054dc7 Increase s2k iterations back to 0x90 2015-08-10 14:35:15 +02:00
Dominik Schürmann acbb3edf9b Fix test cases, add test cases (still 1 failing) 2015-08-10 13:54:41 +02:00
Dominik Schürmann 74c80d4a9d Dont allow RSA_SIGN, RSA_ENCRYPT, deprecated in RFC 2015-08-10 13:54:25 +02:00
Dominik Schürmann 8719938306 Move TODOs into issue 2015-08-10 10:26:58 +02:00
Dominik Schürmann 3d8eda6e3e Improve comments and reasons in PgpConstants, simple checks for insecure asymmetric keys 2015-08-10 09:35:23 +02:00
Dominik Schürmann dba145f5df Follow some of coorus recommendations: better selection of algo whitelist, ignore recipients preferred algos 2015-08-09 21:49:56 +02:00
Dominik Schürmann 57378be1c0 Introduce constants in OpenPgpSignature and DecryptionResult for unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos 2015-08-09 21:49:56 +02:00
Adithya Abraham Philip 03a30fe0e3 added revocation tag NO_REASON to all revocations via PgpKeyOperation 2015-07-14 00:02:53 +05:30
Adithya Abraham Philip b61a7d5535 added licenses, cleaned up code, fixed warnings 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip cdd9de99bf allowed operations to modify CryptoInputParcel they receive 2015-07-13 23:34:06 +05:30
Adithya Abraham Philip fcd27d2600 implemented revocation on deletion 2015-07-13 23:34:06 +05:30
Vincent Breitmoser 5633fcc92f fix symmetric passphrase caching (fixes #1401) 2015-07-08 04:36:43 +02:00
Vincent Breitmoser 510999c3a2 fix result type for divert-to-card new subkey error 2015-07-08 02:28:05 +02:00
Vincent Breitmoser d9b07625e8 addition of subkeys for divert-to-card primary keys is not supported 2015-07-08 01:42:47 +02:00
Vincent Breitmoser 642f83c1f4 better handling of divert-to-card keys for subkey modifications 2015-07-08 01:41:55 +02:00
Dominik Schürmann e780d8270f Merge branch 'master' of github.com:open-keychain/open-keychain 2015-07-07 19:27:49 +02:00
Vincent Breitmoser a320affe86 tests: make sure encryption happens to all enc-capable subkeys 2015-07-07 17:16:11 +02:00
Dominik Schürmann da058e0489 Simplify getLineSeparator in PgpDecryptVerify 2015-07-07 12:35:26 +02:00
Vincent Breitmoser e9e9cf2374 also catch DecoderException in decryptverify 2015-07-06 16:37:47 +02:00
Vincent Breitmoser 7648602fc8 encrypt to all encryption subkeys, rather than just the first 2015-07-06 02:18:34 +02:00
Vincent Breitmoser f1a75a81e7 catch ArrayIndexOutOfBoundsException in decrypt operation, might be thrown from BouncyCastle 2015-07-06 02:02:52 +02:00
Vincent Breitmoser e70d06603a forgot a couple lines to commit 2015-07-06 00:59:28 +02:00
Vincent Breitmoser 42cd103355 nicer error msg if input data cannot be read 2015-07-06 00:55:34 +02:00
Vincent Breitmoser 17defe556a cleanup, NonNull annotation, never return null in PgpDecryptVerify 2015-07-06 00:52:53 +02:00
Adithya Abraham Philip 6d9da28ead removed e.printStackTrace from several places 2015-07-03 20:46:16 +05:30
Dominik Schürmann 195508ed92 Change PIN and Admin PIN after move to key operation 2015-07-02 17:31:01 +02:00
Dominik Schürmann 13bbda1012 Use proper length and mod time for cleartext signature metadata 2015-06-29 23:15:55 +02:00
Dominik Schürmann bdddeb0f41 Return metadata for cleartext sigs 2015-06-29 21:40:07 +02:00
Dominik Schürmann 4667a05c42 Guess mime type like support libs FileProvider 2015-06-29 07:54:58 +02:00
Vincent Breitmoser dce4503ac5 Merge remote-tracking branch 'origin/master' into v/multi-decrypt 2015-06-26 02:44:59 +02:00
Adithya Abraham Philip c748b3e896 fixed fingerprint mismatch issue 2015-06-25 08:40:07 +05:30
Vincent Breitmoser b5501eeea6 working DisplayTextActivity, more input support in DecryptActivity 2015-06-20 01:35:33 +02:00
Vincent Breitmoser 374b21410e Merge branch 'v/instrument' into v/multi-decrypt
Conflicts:
	.travis.yml
	OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2015-06-17 19:24:07 +02:00
Vincent Breitmoser 5e77117232 fix filesize reporting in decrypt operation 2015-06-17 18:53:46 +02:00
Vincent Breitmoser 7d371d8a39 fix returned text of cleartext verify 2015-06-17 18:53:02 +02:00
Vincent Breitmoser b7834b4326 fix recursive log in modifySecretKeyRing 2015-06-17 18:52:58 +02:00
Vincent Breitmoser cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
2015-06-07 00:05:14 +02:00
Vincent Breitmoser 074b6633b0 eventbus: initial attempt, replace messenger hack with eventbus communication 2015-06-06 23:17:42 +02:00
Vincent Breitmoser 441704f163 multi-decrypt: working in principle 2015-06-02 22:19:28 +02:00
Vincent Breitmoser dbfa55f6b9 introduce CachingDataDecryptorFactory towards cached session keys
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.
2015-06-01 00:52:18 +02:00
Vincent Breitmoser 3be44898db only promote subkeys which are actually present 2015-05-30 14:08:49 +02:00
Vincent Breitmoser 0d8370be1d rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel 2015-05-30 13:25:47 +02:00
Vincent Breitmoser 36ecd60c1b better error handling for bad encrypted data checksum 2015-05-30 13:09:09 +02:00
Vincent Breitmoser 313b4ac7d3 rewrite data flow in EncryptFileFragment preserve state correctly 2015-05-30 00:20:11 +02:00
Vincent Breitmoser 1406eec2dc make KeyItem serializble, for state in TokenTextCompleteView 2015-05-30 00:16:27 +02:00
Vincent Breitmoser 38d8f4be52 Merge remote-tracking branch 'origin/master' into development
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
2015-05-28 23:05:41 +02:00
Vincent Breitmoser c4d392051c improve robustness of SecretKeyType handling 2015-05-28 22:34:02 +02:00
Vincent Breitmoser c8f788b925 set to stripped by default, rather than "unavailable" 2015-05-28 22:22:24 +02:00