Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into performance | Vincent Breitmoser | 2016-02-10 | 1 | -24/+25 |
|\ | |||||
| * | Replace spongycastle with bouncycastle | Dominik Schürmann | 2016-02-09 | 1 | -15/+15 |
| | | |||||
* | | performance: add license headers and some documentation | Vincent Breitmoser | 2016-02-10 | 1 | -4/+10 |
| | | |||||
* | | performance: avoid expensive getSecretKeyType call, use cached where possible | Vincent Breitmoser | 2016-02-05 | 1 | -1/+3 |
| | | |||||
* | | performance: cache session keys per compatible S2K configuration | Vincent Breitmoser | 2016-02-05 | 1 | -4/+23 |
|/ | |||||
* | Improve comments and reasons in PgpConstants, simple checks for insecure ↵ | Dominik Schürmann | 2015-08-10 | 1 | -2/+1 |
| | | | | asymmetric keys | ||||
* | Follow some of coorus recommendations: better selection of algo whitelist, ↵ | Dominik Schürmann | 2015-08-09 | 1 | -10/+0 |
| | | | | ignore recipients preferred algos | ||||
* | Introduce constants in OpenPgpSignature and DecryptionResult for ↵ | Dominik Schürmann | 2015-08-09 | 1 | -1/+1 |
| | | | | unsigned/unencrypted content, update API, introduce simple checks for insecure symmetric algos | ||||
* | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -14/+9 |
| | | | | | | | | this commit introduces the CachingDataDecryptorFactory, which wraps a DataDecryptorFactory but supports caching of decrypted session keys. this change also gets rid of runtimeexception based control flow in PgpDecryptVerify. | ||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -8/+10 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | improve robustness of SecretKeyType handling | Vincent Breitmoser | 2015-05-28 | 1 | -5/+7 |
| | | |||||
| * | set to stripped by default, rather than "unavailable" | Vincent Breitmoser | 2015-05-28 | 1 | -3/+3 |
| | | |||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+24 |
|/ | |||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 1 | -2/+5 |
| | |||||
* | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 |
| | |||||
* | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -0/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -6/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -2/+3 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -2/+6 |
| | | |||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -131/+20 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 1 | -23/+24 |
|/ | |||||
* | make constant for certify hash algo | Dominik Schürmann | 2015-03-11 | 1 | -11/+4 |
| | |||||
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -4/+68 |
| | |||||
* | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 1 | -1/+2 |
| | |||||
* | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 1 | -6/+1 |
| | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -37/+5 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 1 | -10/+28 |
| | |||||
* | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 1 | -4/+2 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -4/+2 |
| | | |||||
* | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 1 | -1/+1 |
|/ | |||||
* | Clearup after lockpattern experiments | Dominik Schürmann | 2015-01-06 | 1 | -6/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-06 | 1 | -0/+12 |
|\ | | | | | | | development | ||||
| * | make certify routines more robust (#1016) | Vincent Breitmoser | 2015-01-03 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2014-12-30 | 1 | -1/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | add PIN as a SecretKeyType | Vincent Breitmoser | 2014-12-30 | 1 | -1/+9 |
| | | | |||||
* | | | Passphrase wizard tests | Dominik Schürmann | 2015-01-06 | 1 | -0/+1 |
| |/ |/| | |||||
* | | New work on PIN and lock pattern UI | Dominik Schürmann | 2014-12-29 | 1 | -1/+6 |
|/ | |||||
* | CertifyOperation is not a Pgp- operation | Vincent Breitmoser | 2014-10-12 | 1 | -6/+15 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -1/+4 |
| | |||||
* | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -4/+1 |
| | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
* | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -1/+4 |
| | |||||
* | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 1 | -4/+5 |
| | |||||
* | Fix nullpointer with getS2K() | Dominik Schürmann | 2014-10-02 | 1 | -1/+2 |
| | |||||
* | fix signatures produced by yubikey | Vincent Breitmoser | 2014-09-24 | 1 | -12/+15 |
| | | | | | | | | The timestamp was only set on a second run. This led to a race condition whether the signature could be completed within the same timestamp. Fixes #834 | ||||
* | add test case for duplicate keys in keyring (#870) | Vincent Breitmoser | 2014-09-23 | 1 | -3/+3 |
| | |||||
* | Add null check to getSecretKeyType | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 |
| | |||||
* | Work on Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -10/+16 |
| | |||||
* | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -23/+34 |
| | |||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -0/+53 |
| | |||||
* | Changelog 2.9 | Dominik Schürmann | 2014-08-31 | 1 | -1/+1 |
| |