Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 3 | -4/+35 |
| | |||||
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | added OperationResult support to upload to keyserver | Adithya Abraham Philip | 2015-07-03 | 1 | -0/+4 |
| | |||||
* | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -0/+2 |
| | |||||
* | removed debug logs, added licenses | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+19 |
| | |||||
* | migrated Keybase verification | Adithya Abraham Philip | 2015-06-27 | 2 | -1/+72 |
| | |||||
* | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 4 | -4/+4 |
| | |||||
* | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 |
|\ | |||||
| * | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | 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 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | 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 | ||||
| * | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
| | | |||||
* | | 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 |
| | |||||
* | 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 | 1 | -0/+3 |
| | |||||
* | 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 | 1 | -5/+3 |
| | |||||
* | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 2 | -51/+3 |
| | |||||
* | Moved checks from fragment to operation, impoved logging. | Joey Castillo | 2015-05-12 | 2 | -0/+26 |
| | |||||
* | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+30 |
| | |||||
* | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 1 | -59/+11 |
| | |||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 1 | -52/+6 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 4 | -70/+14 |
| | |||||
* | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 1 | -2/+0 |
| | |||||
* | 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 |
| | | |||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -1/+0 |
| | | |||||
* | | 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 | 2 | -9/+22 |
| | | | | | | | | | | - 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 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 2 | -9/+12 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -8/+11 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 3 | -34/+11 |
| | | |||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 3 | -8/+6 |
| | | |||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 4 | -4/+85 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 2 | -14/+4 |
|/ | |||||
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -2/+2 |
| | |||||
* | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| | |||||
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 1 | -0/+7 |
|\ | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| * | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 1 | -0/+7 |
| | | |||||
* | | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 |
| | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant. |