Commit Graph

5141 Commits

Author SHA1 Message Date
Dominik Schürmann
f33168359c Fix drawer selection for backup 2015-10-15 18:57:08 +02:00
Dominik Schürmann
e4e44f35d8 Layout consistency for backup fragment 2015-10-15 18:51:56 +02:00
Dominik Schürmann
bed3819c11 Unify backup filename 2015-10-15 17:26:51 +02:00
Dominik Schürmann
c4b3dc0643 Dont force OpenKeychain in open with for pgp-keys 2015-10-15 16:52:27 +02:00
Dominik Schürmann
6ea89a0892 Open decrypted application/pgp-keys only in OpenKeychain 2015-10-15 16:48:24 +02:00
Vincent Breitmoser
759ffc5a4b Merge branch 'master' into encrypted-export 2015-10-09 14:57:54 +02:00
Vincent Breitmoser
eff4ae5551 Revert "viewkeyactivity: ask for passphrase for backup only if key has one"
This reverts commit 3316cb65e6.

Committed to wrong branch, derp :)
2015-10-09 14:56:46 +02:00
Vincent Breitmoser
315ed608ae viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 14:56:02 +02:00
Vincent Breitmoser
e67e8cd8c1 fix variable name mistake (wth did I commit there?!) 2015-10-09 14:28:25 +02:00
Vincent Breitmoser
3316cb65e6 viewkeyactivity: ask for passphrase for backup only if key has one 2015-10-09 13:11:25 +02:00
Vincent Breitmoser
83fef47ec8 make openInputStreamSafe static and move to FileHelper 2015-10-09 01:44:40 +02:00
Dominik Schürmann
1c556344c9 Merge branch 'master' of github.com:open-keychain/open-keychain 2015-10-08 20:21:37 +02:00
Dominik Schürmann
1fb0ed8454 Revert "Check that the encrypt input uris are not linked to our own internal storage (OKC-01-010)"
Fix was not sufficient

This reverts commit b10b14d9bc.
2015-10-08 20:21:02 +02:00
Dominik Schürmann
57a04cb8a1 Dont allow encryption of app files via Os methods (OKC-01-010) 2015-10-08 20:20:57 +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
1328309009 Remove ShareHelper: Not compat with Android >= 5, reduce code complexity 2015-10-08 18:47:28 +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
ac28b6bbac test: add tests for detached and clearsign signatures 2015-10-08 18:36:55 +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
e9fa891606 fix jacoco coverage 2015-10-08 18:01:40 +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
Vincent Breitmoser
7619083d5c decrypt: fix broken file save 2015-10-06 14:19:28 +02:00
Dominik Schürmann
dfc396a44c Fix tests for min requirement of 2048 bits 2015-10-04 23:37:03 +02:00
Dominik Schürmann
d3d73f5f85 center wizard buttons for other languages 2015-10-04 22:51:44 +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
Dominik Schürmann
eff59b4645 Show dialog before sharing log 2015-10-04 16:57:28 +02:00
Vincent Breitmoser
7c79902a82 Merge branch 'master' into encrypted-export 2015-10-01 17:28:43 +02:00
Vincent Breitmoser
4f13dc4fc5 spongy: use version which doesn't skip bad signatures 2015-10-01 17:08:50 +02:00
Vincent Breitmoser
ea7560220a spongy: treat eddsa signatures as non-verifiable signatures 2015-10-01 15:30:38 +02:00
Vincent Breitmoser
7f1dbccb5b decrypt: revise card layout margins 2015-09-30 17:19:17 +02:00
Vincent Breitmoser
9ba66aa2ce import: special treatment for application/pgp-keys 2015-09-30 15:17:48 +02:00
Vincent Breitmoser
43e661790d import: simplify ImportKeysActivity, don't display search bar for fixed input 2015-09-30 14:41:15 +02:00
Vincent Breitmoser
4025acd13a enc-export: use BackupActivity for backup from ViewKeyActivity 2015-09-30 14:41:14 +02:00
Vincent Breitmoser
771d9d54b6 inputdata: don't attempt mime decode on application/* except octet-stream 2015-09-30 14:41:14 +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
1dd61cab41 Cleanup in BaseNfcActivity 2015-09-30 12:45:30 +02:00
Dominik Schürmann
051e4b8a79 Improve NFC exception handling, fixes RuntimeExceptions 2015-09-30 12:45:21 +02:00
Dominik Schürmann
08e25747da Fix crashes with Fluffys PGP applet 2015-09-30 12:45:15 +02:00
Dominik Schürmann
1d0e9bf60a Enable YubiKey creation 2015-09-30 12:45:10 +02:00