aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-249-455/+600
|\
| * Buffer ascii armored encryption/signaturesDominik Schürmann2015-04-132-3/+4
| * fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-014-50/+43
| * work on passphrase data flowVincent Breitmoser2015-03-311-10/+34
| * fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-43/+24
| * pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-303-56/+10
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-241-4/+10
| |\
| * | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-221-0/+4
| * | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-6/+7
| * | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-211-2/+4
| * | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-212-3/+7
| * | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+5
| * | fix unit tests (for real)Vincent Breitmoser2015-03-201-2/+10
| * | fix more unit tests (syntax)Vincent Breitmoser2015-03-202-1/+6
| * | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
| * | fix unit tests (syntax)Vincent Breitmoser2015-03-201-1/+1
| * | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
| * | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-207-38/+40
| |\ \
| * | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-202-110/+210
| * | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-191-6/+5
| * | | yubikey certifications!Vincent Breitmoser2015-03-183-134/+170
| * | | generalize nfc crypto input structureVincent Breitmoser2015-03-184-109/+142
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-5/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed #1152:Kent2015-03-201-5/+11
| | |/ | |/|
* | | some linked id ui fine tuningVincent Breitmoser2015-03-264-4/+4
* | | secret/public distinction in LinkedIdViewVincent Breitmoser2015-03-245-20/+13
* | | work on cookie scanning during creationVincent Breitmoser2015-03-244-138/+117
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-249-86/+150
|\| |
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-197-31/+39
| |/
| * Allow for hidden recipients in encrypt methodsDominik Schürmann2015-03-166-23/+81
| * object oriented split user idDominik Schürmann2015-03-161-33/+31
* | support github resource (ci)Vincent Breitmoser2015-03-243-3/+70
* | support github resource (re)Vincent Breitmoser2015-03-241-0/+11
* | support github resource (pa)Vincent Breitmoser2015-03-243-46/+220
* | work on certification uiVincent Breitmoser2015-03-154-0/+26
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-154-29/+31
|\|
| * fix expiry of master keysVincent Breitmoser2015-03-151-15/+16
| * Prefer ZIP algorithm as discussed on OpenPGP WG mailinglistDominik Schürmann2015-03-151-1/+7
| * change user_id primary key in database, use keyring rather than unified query...Vincent Breitmoser2015-03-111-0/+9
| * make constant for certify hash algoDominik Schürmann2015-03-112-11/+6
| * Fix expiry, revoked checks in OpenPgpSignatureResultBuilderDominik Schürmann2015-03-101-2/+2
* | remove notiion of nonce/identifierVincent Breitmoser2015-03-138-70/+25
* | regenerate twitter tokenVincent Breitmoser2015-03-121-4/+16
* | finish implementing twitter resourceVincent Breitmoser2015-03-123-62/+171
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-088-128/+258
|\|
| * add support for certification of user attributesVincent Breitmoser2015-03-081-4/+68
| * Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into pa...Dominik Schürmann2015-03-051-0/+2
| |\
| * | Use ArrayList instead of LinkedListDominik Schürmann2015-03-053-9/+11
| * | Cleanup of PgpConstantsDominik Schürmann2015-03-051-24/+22
| * | Add missing headerDominik Schürmann2015-03-051-0/+17