Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PgpSignEncryptOperation refactoring | Andrea Torlaschi | 2016-05-10 | 1 | -42/+68 |
| | |||||
* | Merge branch 'master' into backup-api | Dominik Schürmann | 2016-05-07 | 10 | -83/+73 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java extern/openpgp-api-lib | ||||
| * | Refactored to reduce coupling between ChangeUnlockParcel and SaveKeyringParcel | Alex Fong | 2016-05-05 | 8 | -22/+22 |
| | | |||||
| * | Refactoring: Removed PassphraseChangeParcel and placed its functionality ↵ | Alex Fong | 2016-05-05 | 8 | -22/+22 |
| | | | | | | | | into ChangeUnlockParcel. | ||||
| * | (WIP) Change password when key is stripped #1692 | Alex Fong | 2016-05-04 | 9 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | Approach: Find the first unstripped secret key and use it for passphrase verification All unstripped keys will have their passphrase changed to new passphrase, if possible. Current Progress: Changing the passphrase of keys works fine. Refactoring to combine "modifySecretKeyring" and newly added method, "modifyKeyRingPassword" may be possible if given the go-ahead. | ||||
| * | Merge pull request #1816 from fiaxh/no_name_choose_email | Dominik Schürmann | 2016-04-29 | 1 | -3/+34 |
| |\ | | | | | | | Correctly handle keys only having an email address | ||||
| | * | Better handle user_id sidecases while splitting | fiaxh | 2016-04-12 | 1 | -3/+34 |
| | | | |||||
| * | | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 1 | -5/+5 |
| | | | |||||
| * | | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 1 | -6/+5 |
| |/ | |||||
| * | get rid of code path for pin and notation data handling | Vincent Breitmoser | 2016-03-23 | 2 | -44/+5 |
| | | |||||
* | | Add backup API | Dominik Schürmann | 2016-03-01 | 1 | -4/+4 |
|/ | |||||
* | ditch isLikelyText flag, set mimeType to text/plain in that case | Vincent Breitmoser | 2016-02-23 | 2 | -6/+5 |
| | |||||
* | add test for CharsetVerifier | Vincent Breitmoser | 2016-02-23 | 1 | -0/+141 |
| | |||||
* | externalize CharsetVerifier, add looksLikeText to OpenPgpMetadata object | Vincent Breitmoser | 2016-02-22 | 1 | -0/+4 |
| | |||||
* | mime: try to decode with given charset or utf-8 while file is read | Vincent Breitmoser | 2016-02-22 | 1 | -4/+137 |
| | |||||
* | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 16 | -92/+92 |
|\ | |||||
| * | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 16 | -92/+92 |
| | | |||||
* | | performance: fix unit tests | Vincent Breitmoser | 2016-02-05 | 4 | -23/+51 |
|/ | |||||
* | Always revoke subkeys with a revocation signature. | KB Sriram | 2016-01-15 | 1 | -0/+274 |
| | | | | | | | | | | | | | | | Unlike UID revocations which are "reversible" by newer UID self-signatures, a subkey revocation should be "permanent" even if followed by a newer self-signature. The RFC is ambiguous on this, but this is the convention used by (e.g.) GnuPG. The rationale for this behaviour is available as comments within the GnuPG source. UID signatures: https://github.com/mtigas/gnupg/blob/50c98c7ed6b542857ee2f902eca36cda37407737/g10/getkey.c#L1668-L1674 Subkey signatures: https://github.com/mtigas/gnupg/blob/50c98c7ed6b542857ee2f902eca36cda37407737/g10/getkey.c#L1990-L1997 | ||||
* | 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 |
| | |