Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Cleanup in BackupCodeFragment | Dominik Schürmann | 2015-10-15 | 1 | -16/+14 | |
| | ||||||
* | Fix drawer selection for backup | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 | |
| | ||||||
* | Layout consistency for backup fragment | Dominik Schürmann | 2015-10-15 | 4 | -435/+373 | |
| | ||||||
* | Unify backup filename | Dominik Schürmann | 2015-10-15 | 2 | -4/+5 | |
| | ||||||
* | Dont force OpenKeychain in open with for pgp-keys | Dominik Schürmann | 2015-10-15 | 1 | -1/+1 | |
| | ||||||
* | Open decrypted application/pgp-keys only in OpenKeychain | Dominik Schürmann | 2015-10-15 | 1 | -2/+7 | |
| | ||||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-09 | 4 | -39/+83 | |
|\ | ||||||
| * | Revert "viewkeyactivity: ask for passphrase for backup only if key has one" | Vincent Breitmoser | 2015-10-09 | 1 | -29/+3 | |
| | | | | | | | | | | | | This reverts commit 3316cb65e6b739deb7d0652fcd16a9d9bedf8c5b. Committed to wrong branch, derp :) | |||||
| * | fix variable name mistake (wth did I commit there?!) | Vincent Breitmoser | 2015-10-09 | 1 | -2/+2 | |
| | | ||||||
| * | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 | |
| | | ||||||
| * | make openInputStreamSafe static and move to FileHelper | Vincent Breitmoser | 2015-10-09 | 2 | -87/+85 | |
| | | ||||||
| * | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2015-10-08 | 9 | -440/+424 | |
| |\ | ||||||
| * | | Revert "Check that the encrypt input uris are not linked to our own internal ↵ | Dominik Schürmann | 2015-10-08 | 1 | -26/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | storage (OKC-01-010)" Fix was not sufficient This reverts commit b10b14d9bc737edc56af0eec3a14bed5ebf3ea39. | |||||
| * | | Dont allow encryption of app files via Os methods (OKC-01-010) | Dominik Schürmann | 2015-10-08 | 1 | -3/+73 | |
| | | | ||||||
* | | | viewkeyactivity: ask for passphrase for backup only if key has one | Vincent Breitmoser | 2015-10-09 | 1 | -3/+29 | |
| | | | ||||||
* | | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 43 | -673/+593 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | pgpdecryptverify: only use keys for verification which are allowed to sign ↵ | Vincent Breitmoser | 2015-10-08 | 1 | -2/+10 | |
| | | | | | | | | | | | | (OKC-01-013) | |||||
| * | | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2015-10-08 | 5 | -160/+9 | |
| |\| | ||||||
| | * | Remove ShareHelper: Not compat with Android >= 5, reduce code complexity | Dominik Schürmann | 2015-10-08 | 4 | -159/+6 | |
| | | | ||||||
| | * | Constant for max number of canonicalized user ids | Dominik Schürmann | 2015-10-08 | 1 | -1/+3 | |
| | | | ||||||
| * | | improve tests, get rid of some redundant checks | Vincent Breitmoser | 2015-10-08 | 1 | -10/+0 | |
| | | | ||||||
| * | | pgpdecryptverify: get rid of duplicate code path for binary signature ↵ | Vincent Breitmoser | 2015-10-08 | 3 | -107/+2 | |
| | | | | | | | | | | | | verification | |||||
| * | | pgpdecryptverify: fix non-onepass signature checking | Vincent Breitmoser | 2015-10-08 | 2 | -1/+3 | |
| | | | ||||||
| * | | pgpsignencrypt: unsupported parameter combinations are a bug | Vincent Breitmoser | 2015-10-08 | 3 | -5/+1 | |
| | | | ||||||
| * | | pgpdecryptverify: externalize PgpSignatureChecker | Vincent Breitmoser | 2015-10-08 | 2 | -297/+369 | |
| | | | ||||||
| * | | pgpdecryptverify: move cleartext verification into SignatureChecker | Vincent Breitmoser | 2015-10-08 | 1 | -156/+139 | |
| | | | ||||||
| * | | pgpdecryptverify: refactor signature verification state into ↵ | Vincent Breitmoser | 2015-10-08 | 2 | -135/+141 | |
| | | | | | | | | | | | | SignatureChecker subclass | |||||
| * | | pgpdecryptverify: fix one pass signature check, actually use bracketed structure | Vincent Breitmoser | 2015-10-07 | 3 | -6/+35 | |
| | | | ||||||
| * | | pgpdecryptverify: refactor signature processing | Vincent Breitmoser | 2015-10-06 | 3 | -79/+82 | |
| |/ | ||||||
| * | use only primary and mutually bound subkeys for fingerprint verification | Vincent Breitmoser | 2015-10-06 | 3 | -7/+11 | |
| | | ||||||
| * | center wizard buttons for other languages | Dominik Schürmann | 2015-10-04 | 10 | -21/+21 | |
| | | ||||||
| * | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 16 | -39/+41 | |
| | | ||||||
| * | Show dialog before sharing log | Dominik Schürmann | 2015-10-04 | 3 | -5/+88 | |
| | | ||||||
* | | decrypt: fix broken file save | Vincent Breitmoser | 2015-10-06 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 11 | -116/+140 | |
|\| | ||||||
| * | No show key button for RESULT_INVALID_SIGNATURE, Cleanup | Dominik Schürmann | 2015-09-30 | 4 | -10/+20 | |
| | | ||||||
| * | Cleanup in BaseNfcActivity | Dominik Schürmann | 2015-09-30 | 1 | -10/+2 | |
| | | ||||||
| * | Improve NFC exception handling, fixes RuntimeExceptions | Dominik Schürmann | 2015-09-30 | 7 | -59/+68 | |
| | | ||||||
| * | Fix crashes with Fluffys PGP applet | Dominik Schürmann | 2015-09-30 | 4 | -20/+32 | |
| | | ||||||
| * | Enable YubiKey creation | Dominik Schürmann | 2015-09-30 | 1 | -14/+5 | |
| | | ||||||
| * | Full 160 bit for phrase confirm, stuffed with ones | Dominik Schürmann | 2015-09-29 | 3 | -15/+25 | |
| | | ||||||
* | | decrypt: revise card layout margins | Vincent Breitmoser | 2015-09-30 | 1 | -16/+18 | |
| | | ||||||
* | | import: special treatment for application/pgp-keys | Vincent Breitmoser | 2015-09-30 | 2 | -4/+11 | |
| | | ||||||
* | | import: simplify ImportKeysActivity, don't display search bar for fixed input | Vincent Breitmoser | 2015-09-30 | 2 | -168/+109 | |
| | | ||||||
* | | enc-export: use BackupActivity for backup from ViewKeyActivity | Vincent Breitmoser | 2015-09-30 | 4 | -11/+17 | |
| | | ||||||
* | | inputdata: don't attempt mime decode on application/* except octet-stream | Vincent Breitmoser | 2015-09-30 | 1 | -1/+1 | |
| | | ||||||
* | | decryptverify: add trivial detection of pgp ascii-armored data | Vincent Breitmoser | 2015-09-30 | 1 | -2/+33 | |
| | | ||||||
* | | enc-export: handle onSaveInstanceState, add nicer layout for landscape | Vincent Breitmoser | 2015-09-29 | 4 | -45/+93 | |
| | | ||||||
* | | enc-export: add "back" button to fail state | Vincent Breitmoser | 2015-09-29 | 5 | -20/+439 | |
| | | ||||||
* | | enc-export: add comments about debug mechanisms | Vincent Breitmoser | 2015-09-29 | 1 | -0/+3 | |
| | |