cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,091 Commits 1 Branch 0 Tags
f461d6b1d83604d6752ac97128403ff2a34ddec4
Commit Graph

574 Commits

Author SHA1 Message Date
Vincent Breitmoser
f461d6b1d8 decryptverify: add trivial detection of pgp ascii-armored data 2015-09-30 14:41:09 +02:00
Vincent Breitmoser
0e613aff2e Merge remote-tracking branch 'origin/master' into encrypted-export 2015-09-28 18:27:29 +02:00
Vincent Breitmoser
97b2178a29 upload: re-add upload by bytes 2015-09-28 18:03:58 +02:00
Vincent Breitmoser
e321f992f2 signencrypt: make sure we buffer the InputStream 2015-09-28 04:24:22 +02:00
Dominik Schürmann
29e9b2fa1e Dont import more than 100 User IDs (OKC-01-002) 2015-09-25 01:38:43 +02:00
Dominik Schürmann
21b83d8fa4 Reject filenames with slashes completly 2015-09-24 23:32:51 +02:00
Vincent Breitmoser
955a1f4b26 mime: support for signed-then-encrypted format 2015-09-17 21:51:11 +02:00
Vincent Breitmoser
6624d1f830 mime: respect charset header (default to utf-8) 2015-09-16 19:54:57 +02:00
Vincent Breitmoser
3cd54581c3 mime: create more general InputDataOperation, which for now and does basic mime parsing 2015-09-15 03:02:05 +02:00
Vincent Breitmoser
aad606c47f strip encrypted filenames to basenames (OKC-01-004) 2015-09-11 03:30:10 +02:00
Vincent Breitmoser
9d97d37c06 perform fingerprint check after canonicalization (OKC-01-009) 2015-09-11 01:57:17 +02:00
Vincent Breitmoser
950409ce55 complain about mdc insecurity status only if data actually was encrypted 2015-09-10 22:36:07 +02:00
Vincent Breitmoser
b78954fc16 add support for signed-only data in the backend (#1507) 2015-09-10 21:44:15 +02:00
Dominik Schürmann
e9836372b4 Use new HashSet<>(Arrays.asList()) instead of static 2015-09-04 13:39:03 +02:00
Vincent Breitmoser
a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) 
Merge Linked Identities.

Also includes an important fix for OperationHelper ids, which had an
error in the bit mask logic.

Conflicts:
	Graphics/update-drawables.sh
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java
	OpenKeychain/src/main/res/anim/fade_in.xml
	OpenKeychain/src/main/res/anim/fade_out.xml
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml
	OpenKeychain/src/main/res/layout/view_key_fragment.xml
	OpenKeychain/src/main/res/menu/key_view.xml
	OpenKeychain/src/main/res/values/strings.xml
	OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
	README.md
 2015-08-29 13:28:56 +02:00
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