aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0851-738/+773
|\
| * pgpdecryptverify: only use keys for verification which are allowed to sign (O...Vincent Breitmoser2015-10-081-2/+10
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-10-085-160/+9
| |\
| | * Remove ShareHelper: Not compat with Android >= 5, reduce code complexityDominik Schürmann2015-10-084-159/+6
| | * Constant for max number of canonicalized user idsDominik Schürmann2015-10-081-1/+3
| * | improve tests, get rid of some redundant checksVincent Breitmoser2015-10-082-14/+7
| * | pgpdecryptverify: get rid of duplicate code path for binary signature verific...Vincent Breitmoser2015-10-084-108/+3
| * | pgpdecryptverify: fix non-onepass signature checkingVincent Breitmoser2015-10-082-1/+3
| * | test: add tests for detached and clearsign signaturesVincent Breitmoser2015-10-081-1/+114
| * | pgpsignencrypt: unsupported parameter combinations are a bugVincent Breitmoser2015-10-083-5/+1
| * | pgpdecryptverify: externalize PgpSignatureCheckerVincent Breitmoser2015-10-082-297/+369
| * | fix jacoco coverageVincent Breitmoser2015-10-081-6/+5
| * | pgpdecryptverify: move cleartext verification into SignatureCheckerVincent Breitmoser2015-10-081-156/+139
| * | pgpdecryptverify: refactor signature verification state into SignatureChecker...Vincent Breitmoser2015-10-082-135/+141
| * | pgpdecryptverify: fix one pass signature check, actually use bracketed structureVincent Breitmoser2015-10-073-6/+35
| * | pgpdecryptverify: refactor signature processingVincent Breitmoser2015-10-063-79/+82
| |/
| * use only primary and mutually bound subkeys for fingerprint verificationVincent Breitmoser2015-10-063-7/+11
| * Fix tests for min requirement of 2048 bitsDominik Schürmann2015-10-045-41/+41
| * center wizard buttons for other languagesDominik Schürmann2015-10-0410-21/+21
| * Raise min asymmetric key length for all ciphers to 2048 bitDominik Schürmann2015-10-0422-61/+63
| * Show dialog before sharing logDominik Schürmann2015-10-043-5/+88
* | decrypt: fix broken file saveVincent Breitmoser2015-10-061-2/+2
* | Merge branch 'master' into encrypted-exportVincent Breitmoser2015-10-0113-116/+143
|\|
| * spongy: use version which doesn't skip bad signaturesVincent Breitmoser2015-10-012-0/+3
| * spongy: treat eddsa signatures as non-verifiable signaturesVincent Breitmoser2015-10-011-0/+0
| * No show key button for RESULT_INVALID_SIGNATURE, CleanupDominik Schürmann2015-09-304-10/+20
| * Cleanup in BaseNfcActivityDominik Schürmann2015-09-301-10/+2
| * Improve NFC exception handling, fixes RuntimeExceptionsDominik Schürmann2015-09-307-59/+68
| * Fix crashes with Fluffys PGP appletDominik Schürmann2015-09-304-20/+32
| * Enable YubiKey creationDominik Schürmann2015-09-301-14/+5
| * Full 160 bit for phrase confirm, stuffed with onesDominik Schürmann2015-09-293-15/+25
* | decrypt: revise card layout marginsVincent Breitmoser2015-09-301-16/+18
* | import: special treatment for application/pgp-keysVincent Breitmoser2015-09-302-4/+11
* | import: simplify ImportKeysActivity, don't display search bar for fixed inputVincent Breitmoser2015-09-302-168/+109
* | enc-export: use BackupActivity for backup from ViewKeyActivityVincent Breitmoser2015-09-304-11/+17
* | inputdata: don't attempt mime decode on application/* except octet-streamVincent Breitmoser2015-09-301-1/+1
* | decryptverify: add trivial detection of pgp ascii-armored dataVincent Breitmoser2015-09-302-2/+36
* | enc-export: handle onSaveInstanceState, add nicer layout for landscapeVincent Breitmoser2015-09-294-45/+93
* | enc-export: add "back" button to fail stateVincent Breitmoser2015-09-295-20/+439
* | enc-export: add comments about debug mechanismsVincent Breitmoser2015-09-291-0/+3
* | enc-export: localize snackbar stringsVincent Breitmoser2015-09-293-7/+11
* | enc-export: transifex compatVincent Breitmoser2015-09-291-7/+7
* | enc-export: localization, and layout compatibilityVincent Breitmoser2015-09-294-72/+394
* | enc-export: rename fragment to match classVincent Breitmoser2015-09-292-1/+1
* | enc-export: implement save file as CREATE_DOCUMENT, with static fallback for ...Vincent Breitmoser2015-09-293-16/+76
* | enc-export: mv BackupCodeEntryFragment BackupCodeFragmentVincent Breitmoser2015-09-292-4/+4
* | use annotations for android sdk constraintsVincent Breitmoser2015-09-284-41/+35
* | Merge remote-tracking branch 'origin/master' into encrypted-exportVincent Breitmoser2015-09-2871-745/+2100
|\|
| * Harden parsing of keyserver results (OKC-01-003)Dominik Schürmann2015-09-254-30/+48
| * Dont import more than 100 User IDs (OKC-01-002)Dominik Schürmann2015-09-253-2/+8