Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | license header for PgpCertifyOperation | Dominik Schürmann | 2015-05-04 | 1 | -1/+19 |
| | |||||
* | Apply patch from ↵ | Dominik Schürmann | 2015-05-04 | 1 | -2/+9 |
| | | | | https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 | ||||
* | Buffer ascii armored encryption/signatures | Dominik Schürmann | 2015-04-13 | 2 | -3/+4 |
| | |||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 4 | -50/+43 |
| | |||||
* | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 1 | -10/+34 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -43/+24 |
| | |||||
* | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 3 | -56/+10 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -4/+10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 |
| | | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding. | ||||
* | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 |
| | | |||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -6/+7 |
| | | |||||
* | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 1 | -2/+4 |
| | | |||||
* | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 2 | -3/+7 |
| | | | | | | | | | | - 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/+5 |
| | | |||||
* | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 1 | -2/+10 |
| | | |||||
* | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 2 | -1/+6 |
| | | |||||
* | | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 |
| | | |||||
* | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+1 |
| | | |||||
* | | re-inline cryptoInput variable | Vincent Breitmoser | 2015-03-20 | 1 | -32/+34 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 7 | -38/+40 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -31/+39 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 2 | -110/+210 |
| | | |||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 1 | -6/+5 |
| | | |||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 3 | -134/+170 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 4 | -109/+142 |
|/ | |||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 6 | -23/+81 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -33/+31 |
| | |||||
* | fix expiry of master keys | Vincent Breitmoser | 2015-03-15 | 1 | -15/+16 |
| | | | | fixes #1141 | ||||
* | Prefer ZIP algorithm as discussed on OpenPGP WG mailinglist | Dominik Schürmann | 2015-03-15 | 1 | -1/+7 |
| | |||||
* | change user_id primary key in database, use keyring rather than unified ↵ | Vincent Breitmoser | 2015-03-11 | 1 | -0/+9 |
| | | | | query in consolidate | ||||
* | make constant for certify hash algo | Dominik Schürmann | 2015-03-11 | 2 | -11/+6 |
| | |||||
* | Fix expiry, revoked checks in OpenPgpSignatureResultBuilder | Dominik Schürmann | 2015-03-10 | 1 | -2/+2 |
| | |||||
* | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -4/+68 |
| | |||||
* | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵ | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java | ||||
* | | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 3 | -9/+11 |
| | | |||||
* | | Cleanup of PgpConstants | Dominik Schürmann | 2015-03-05 | 1 | -24/+22 |
| | | |||||
* | | Add missing header | Dominik Schürmann | 2015-03-05 | 1 | -0/+17 |
| | | |||||
* | | Check for insecure hash and symmetric encryption algos on decrypt | Dominik Schürmann | 2015-03-05 | 1 | -0/+30 |
| | | |||||
* | | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 4 | -33/+51 |
| | | |||||
* | | Add missing file with PGP Constants | Dominik Schürmann | 2015-03-05 | 1 | -0/+69 |
| | | |||||
* | | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 5 | -129/+39 |
| | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 5 | -20/+40 |
| | | |||||
* | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
|/ | |||||
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -1/+163 |
|\ | |||||
| * | fix signature check | Dominik Schürmann | 2014-11-22 | 1 | -2/+2 |
| | | |||||
| * | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 2 | -8/+11 |
| | | |||||
| * | Use master key id for keybase proof verification | Dominik Schürmann | 2014-11-22 | 1 | -10/+4 |
| | | |||||
| * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -1/+1 |
| |\ | |||||
| * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -1/+161 |
| | | | |||||
* | | | split up and mark unsafe expiry-related methods | Vincent Breitmoser | 2015-02-26 | 2 | -4/+25 |
| | | |