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

607 Commits

Author SHA1 Message Date
Dominik Schürmann
b84c9a8fb6 Update spongycastle to 1.53 2015-12-22 13:31:55 +01:00
Vincent Breitmoser
e32c1a9ced api: add micalg result extra to detached signature api call 2015-12-17 01:08:23 +01:00
Vincent Breitmoser
c4599798f9 fix delete file securely method and use for delete original file 2015-11-15 23:25:39 +01:00
Vincent Breitmoser
529b9518c1 decrypt: skip all encountered marker packets (fix #1582) 2015-11-15 01:01:09 +01:00
Vincent Breitmoser
712e526ab5 Merge commit '816dce0334e8b8d9da3cb00d31d26033b17040a3' 2015-11-13 17:00:09 +01:00
Vincent Breitmoser
2d7dada888 decrypt: skip unavailable and unsuitable keys 2015-11-13 16:58:26 +01:00
Vincent Breitmoser
5c47570e90 import: apply fixPgpMessage to text for import from clipboard 2015-11-06 12:09:27 +01:00
Vincent Breitmoser
a4518c43c2 bench: simple working benchmark 2015-11-04 20:24:06 +01:00
Vincent Breitmoser
8feed0b097 bench: add benchmark operation for testing 2015-11-04 19:09:51 +01:00
Vincent Breitmoser
4e60f1bc75 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-21 21:58:30 +02:00
Dominik Schürmann
10fed404ae SHA1 and RIPEMD160 are not declared insecure until widely deployed 2015-10-21 21:42:37 +02:00
Vincent Breitmoser
f7bfe932ec fix crash due to malformed log entry 2015-10-21 17:11:02 +02:00
Dominik Schürmann
cac7c3234a Support backupVersion ASCII Armor header 2015-10-15 22:50:34 +02:00
Dominik Schürmann
a5ff2f8fe3 Mime type consistency 2015-10-15 19:56:04 +02:00
Vincent Breitmoser
759ffc5a4b Merge branch 'master' into encrypted-export 2015-10-09 14:57:54 +02:00
Vincent Breitmoser
e67e8cd8c1 fix variable name mistake (wth did I commit there?!) 2015-10-09 14:28:25 +02:00
Vincent Breitmoser
6cf7e3e541 Merge branch 'master' into encrypted-export 2015-10-08 20:05:56 +02:00
Vincent Breitmoser
ba9b8f3a60 pgpdecryptverify: only use keys for verification which are allowed to sign (OKC-01-013) 2015-10-08 20:01:04 +02:00
Vincent Breitmoser
084d6f1d3d Merge remote-tracking branch 'origin/master' 2015-10-08 19:56:33 +02:00
Vincent Breitmoser
3bf653775b improve tests, get rid of some redundant checks 2015-10-08 19:55:28 +02:00
Vincent Breitmoser
81a462c2ac pgpdecryptverify: get rid of duplicate code path for binary signature verification 2015-10-08 19:54:50 +02:00
Dominik Schürmann
2b735102f7 Constant for max number of canonicalized user ids 2015-10-08 18:39:27 +02:00
Vincent Breitmoser
cda1ba47d2 pgpdecryptverify: fix non-onepass signature checking 2015-10-08 18:37:30 +02:00
Vincent Breitmoser
e29f9017f7 pgpsignencrypt: unsupported parameter combinations are a bug 2015-10-08 18:36:16 +02:00
Vincent Breitmoser
d6076a998c pgpdecryptverify: externalize PgpSignatureChecker 2015-10-08 18:02:17 +02:00
Vincent Breitmoser
4b2f561a73 pgpdecryptverify: move cleartext verification into SignatureChecker 2015-10-08 14:36:20 +02:00
Vincent Breitmoser
fe8db664a8 pgpdecryptverify: refactor signature verification state into SignatureChecker subclass 2015-10-08 13:53:58 +02:00
Vincent Breitmoser
f6de2712d3 pgpdecryptverify: fix one pass signature check, actually use bracketed structure 2015-10-07 18:57:43 +02:00
Vincent Breitmoser
bafc108969 pgpdecryptverify: refactor signature processing 2015-10-06 17:34:47 +02:00
Vincent Breitmoser
8f40c6df51 use only primary and mutually bound subkeys for fingerprint verification 2015-10-06 15:06:36 +02:00
Dominik Schürmann
dfce5449c2 Raise min asymmetric key length for all ciphers to 2048 bit 2015-10-04 22:46:21 +02:00
Vincent Breitmoser
f461d6b1d8 decryptverify: add trivial detection of pgp ascii-armored data 2015-09-30 14:41:09 +02:00
Dominik Schürmann
405b959fb8 No show key button for RESULT_INVALID_SIGNATURE, Cleanup 2015-09-30 12:46:26 +02:00
Dominik Schürmann
08e25747da Fix crashes with Fluffys PGP applet 2015-09-30 12:45:15 +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