| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | linked-ids: rename RawLinkedIdentity to UriAttribute | Vincent Breitmoser | 2015-05-09 | 1 | -1/+1 |
| | | |||||
| * | linked-ids: code cleanup, handle all lint errors | Vincent Breitmoser | 2015-05-09 | 8 | -1128/+0 |
| | | |||||
| * | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 1 | -0/+11 |
| | | |||||
| * | update uris and cookie patterns, plus some stylings | Vincent Breitmoser | 2015-04-25 | 3 | -7/+7 |
| | | |||||
| * | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-24 | 9 | -455/+600 |
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * | 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 | ||||
| | * | | 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 | ||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 1 | -5/+11 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * | | | Fixed #1152: | Kent | 2015-03-20 | 1 | -5/+11 |
| | | |/ | |/| | | | | | | | - Checking if input.getSignatureSubKeyId() is not null before proceeding. | ||||
| * | | | some linked id ui fine tuning | Vincent Breitmoser | 2015-03-26 | 4 | -4/+4 |
| | | | | |||||
| * | | | secret/public distinction in LinkedIdView | Vincent Breitmoser | 2015-03-24 | 5 | -20/+13 |
| | | | | |||||
| * | | | work on cookie scanning during creation | Vincent Breitmoser | 2015-03-24 | 4 | -138/+117 |
| | | | | |||||
| * | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-24 | 9 | -86/+150 |
| |\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * | | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 7 | -31/+39 |
| | |/ | |||||
| | * | 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 |
| | | | |||||
| * | | support github resource (ci) | Vincent Breitmoser | 2015-03-24 | 3 | -3/+70 |
| | | | |||||
| * | | support github resource (re) | Vincent Breitmoser | 2015-03-24 | 1 | -0/+11 |
| | | | |||||
| * | | support github resource (pa) | Vincent Breitmoser | 2015-03-24 | 3 | -46/+220 |
| | | | |||||
| * | | work on certification ui | Vincent Breitmoser | 2015-03-15 | 4 | -0/+26 |
| | | | |||||
| * | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-15 | 4 | -29/+31 |
| |\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java | ||||
| | * | 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 |
| | | | |||||
| * | | remove notiion of nonce/identifier | Vincent Breitmoser | 2015-03-13 | 8 | -70/+25 |
| | | | |||||
| * | | regenerate twitter token | Vincent Breitmoser | 2015-03-12 | 1 | -4/+16 |
| | | | |||||
| * | | finish implementing twitter resource | Vincent Breitmoser | 2015-03-12 | 3 | -62/+171 |
| | | | |||||
| * | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 8 | -128/+258 |
| |\| | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| | * | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -4/+68 |
| | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |