Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 2 | -2/+6 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| * | | | | | | | | | | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 4 | -7/+13 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | |||||
| * | | | | | | | | | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 4 | -7/+13 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 3 | -18/+25 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml | |||||
| * | | | | | | | | | | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 2 | -3/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -3/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 2 | -12/+12 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -0/+13 | |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | | | | | | | | rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel | Vincent Breitmoser | 2015-05-30 | 1 | -10/+21 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | fix RequiredInputParcel handling in CertifyOperation | Vincent Breitmoser | 2015-05-29 | 1 | -6/+25 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 2 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PgpDecryptVerify changes | |||||
* | | | | | | | | | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1281 | |||||
* | | | | | | | | | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 2 | -2/+32 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Bugfixes and changes based on feedback | Joey Castillo | 2015-05-13 | 2 | -6/+4 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 4 | -145/+4 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 3 | -18/+60 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 2 | -0/+107 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
* | | | | | | | | | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 1 | -6/+7 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 1 | -59/+11 | |
| | | | | | | | | ||||||
* | | | | | | | | Fix signing subkey selection in remote service | Dominik Schürmann | 2015-04-07 | 1 | -0/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 2 | -53/+7 | |
| | | | | | | | | ||||||
* | | | | | | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 5 | -76/+50 | |
| | | | | | | | | ||||||
* | | | | | | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 2 | -4/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
| | | | | | | | | ||||||
* | | | | | | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 1 | -2/+18 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -9/+11 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.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/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | |||||
| * | | | | | | | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -9/+11 | |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | |||||
* | | | | | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 2 | -14/+2 | |
| | | | | | | | ||||||
* | | | | | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -2/+7 | |
| | | | | | | | ||||||
* | | | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 4 | -5/+5 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | | | | | | Reworked Notify class | Manoj Khanna | 2015-03-20 | 4 | -16/+16 | |
| | | | | | | | ||||||
* | | | | | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 3 | -11/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | |||||
* | | | | | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 | |
| | | | | | | | ||||||
* | | | | | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+3 | |
| | | | | | | | ||||||
* | | | | | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -5/+6 | |
| | | | | | | | ||||||
* | | | | | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -2/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 5 | -12/+18 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -12/+18 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 5 | -40/+22 | |
| | | | | | | ||||||
* | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 4 | -16/+15 | |
| | | | | | | ||||||
* | | | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 5 | -26/+107 | |
| | | | | | |