Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use more generic 'Security Token' where possible, add sutitle to create key ↵ | Dominik Schürmann | 2016-01-10 | 2 | -12/+12 |
| | | | | what tokens are supported | ||||
* | Tests: Use ECC where possible | Dominik Schürmann | 2016-01-03 | 6 | -56/+76 |
| | |||||
* | Update spongycastle to 1.53 | Dominik Schürmann | 2015-12-22 | 1 | -2/+2 |
| | |||||
* | some work on benchmark operation (affects only debug build) | Vincent Breitmoser | 2015-12-13 | 1 | -0/+81 |
| | |||||
* | fix unit tests (IllegalStateException) | Vincent Breitmoser | 2015-11-16 | 1 | -5/+14 |
| | |||||
* | decrypt: add tests for skipping stripped and unsuitable decryption subkeys | Vincent Breitmoser | 2015-11-13 | 1 | -3/+48 |
| | |||||
* | Cleanup, fix advanced sharing | Dominik Schürmann | 2015-10-15 | 1 | -6/+6 |
| | |||||
* | Rename TemporaryStorageProvider to TemporaryFileProvider, use interface for ↵ | Dominik Schürmann | 2015-10-15 | 2 | -6/+6 |
| | | | | db contract | ||||
* | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-08 | 7 | -59/+175 |
|\ | |||||
| * | improve tests, get rid of some redundant checks | Vincent Breitmoser | 2015-10-08 | 1 | -4/+7 |
| | | |||||
| * | pgpdecryptverify: get rid of duplicate code path for binary signature ↵ | Vincent Breitmoser | 2015-10-08 | 1 | -1/+1 |
| | | | | | | | | verification | ||||
| * | test: add tests for detached and clearsign signatures | Vincent Breitmoser | 2015-10-08 | 1 | -1/+114 |
| | | |||||
| * | Fix tests for min requirement of 2048 bits | Dominik Schürmann | 2015-10-04 | 5 | -41/+41 |
| | | |||||
| * | Raise min asymmetric key length for all ciphers to 2048 bit | Dominik Schürmann | 2015-10-04 | 6 | -22/+22 |
| | | |||||
* | | Merge branch 'master' into encrypted-export | Vincent Breitmoser | 2015-10-01 | 1 | -0/+3 |
|\| | |||||
| * | spongy: use version which doesn't skip bad signatures | Vincent Breitmoser | 2015-10-01 | 1 | -0/+3 |
| | | |||||
* | | decryptverify: add trivial detection of pgp ascii-armored data | Vincent Breitmoser | 2015-09-30 | 1 | -0/+3 |
| | | |||||
* | | export: improve stream handling, performance | Vincent Breitmoser | 2015-09-28 | 1 | -0/+16 |
| | | |||||
* | | export: support encrypted export, first version | Vincent Breitmoser | 2015-09-28 | 2 | -31/+202 |
| | | |||||
* | | export: more cleanup and splitting into subroutines | Vincent Breitmoser | 2015-09-26 | 1 | -4/+2 |
|/ | |||||
* | mime: don't decrypt in mime parsing only test | Vincent Breitmoser | 2015-09-17 | 1 | -2/+1 |
| | |||||
* | mime: respect charset header (default to utf-8) | Vincent Breitmoser | 2015-09-16 | 1 | -2/+2 |
| | |||||
* | mime: add logging to InputDataOperation | Vincent Breitmoser | 2015-09-15 | 1 | -3/+0 |
| | |||||
* | mime: create more general InputDataOperation, which for now and does basic ↵ | Vincent Breitmoser | 2015-09-15 | 1 | -0/+166 |
| | | | | mime parsing | ||||
* | fix unit tests for new savePublicKeyRing method signature | Vincent Breitmoser | 2015-09-11 | 4 | -4/+4 |
| | |||||
* | add test for signed binary data (#1507) | Vincent Breitmoser | 2015-09-10 | 1 | -1/+55 |
| | |||||
* | fix unit test for linked ids | Vincent Breitmoser | 2015-09-06 | 1 | -1/+1 |
| | |||||
* | move stray test file to correct position | Vincent Breitmoser | 2015-08-29 | 1 | -0/+46 |
| | |||||
* | Merge branch 'linked-identities' (and fix OperationHelper ids) | Vincent Breitmoser | 2015-08-29 | 2 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Remove dead code | Dominik Schürmann | 2015-08-27 | 1 | -17/+17 |
| | | |||||
* | | Disable new failing test for now | Dominik Schürmann | 2015-08-10 | 1 | -2/+3 |
| | | |||||
* | | Fix test cases, add test cases (still 1 failing) | Dominik Schürmann | 2015-08-10 | 4 | -40/+166 |
| | | |||||
* | | Introduce constants in OpenPgpSignature and DecryptionResult for ↵ | Dominik Schürmann | 2015-08-09 | 1 | -7/+7 |
| | | | | | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos | ||||
* | | made mSignatureTime optional in CryptoOperationHelper | Adithya Abraham Philip | 2015-07-15 | 4 | -20/+32 |
| | | |||||
* | | Tests not working anymore on travis after using new annotation parameter | Dominik Schürmann | 2015-07-09 | 14 | -57/+84 |
| | | | | | | | | | | | | Revert "Get rid of robolectric workaround by using new annotation in robolectric 3.0" This reverts commit 85a47d22f9bb1e4aaf5770c67416a5532977658e. | ||||
* | | Get rid of robolectric workaround by using new annotation in robolectric 3.0 | Dominik Schürmann | 2015-07-09 | 14 | -84/+57 |
| | | |||||
* | | better handling of divert-to-card keys for subkey modifications | Vincent Breitmoser | 2015-07-08 | 2 | -8/+31 |
| | | |||||
* | | tests: make sure encryption happens to all enc-capable subkeys | Vincent Breitmoser | 2015-07-07 | 2 | -11/+120 |
| | | |||||
* | | fix PromoteKeyOperationTest | Vincent Breitmoser | 2015-07-06 | 1 | -11/+10 |
| | | |||||
* | | Merge branch 'master' of github.com:open-keychain/open-keychain | Adithya Abraham Philip | 2015-06-30 | 1 | -4/+3 |
|\ \ | |||||
| * | | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 1 | -4/+3 |
| | | | |||||
* | | | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 1 | -2/+1 |
|/ / | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 1 | -0/+2 |
|\ \ | |||||
| * | | Import R and BuildConfig explicitly | Thialfihar | 2015-06-26 | 1 | -0/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 19 | -0/+5517 |
| |\ \ | | |/ | |/| | |||||
* | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 19 | -0/+5529 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Add missing WorkaroundBuildConfig | Dominik Schürmann | 2015-06-11 | 1 | -0/+14 |
| | | |||||
| * | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 13 | -13/+26 |
| | | |||||
| * | Use new officially supported way for local unit tests, many dependencies ↵ | Dominik Schürmann | 2015-06-11 | 18 | -0/+5490 |
|/ | | | | upgraded for this, temporary disabled separate debug builds | ||||
* | update unit test support in build files | Vincent Breitmoser | 2014-05-27 | 2 | -69/+0 |
| |