aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
Commit message (Expand)AuthorAgeFilesLines
* prepare superclass extraction for final linked id creation fragmentVincent Breitmoser2015-03-063-4/+4
* work on LinkedIdViewFragmentVincent Breitmoser2015-03-055-4/+26
* make linked identity list homogeneousVincent Breitmoser2015-03-058-28/+102
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-051-9/+10
|\
| * Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
* | small fixes to the matcherVincent Breitmoser2015-03-051-5/+2
* | fixed length identifiersVincent Breitmoser2015-03-052-7/+4
* | do a TON of UI workVincent Breitmoser2015-03-058-131/+211
* | work more on separation of linked identities and resources, initial ui workVincent Breitmoser2015-03-047-196/+190
* | nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
* | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-0216-479/+1202
|\|
| * Merge keybase-proof branchDominik Schürmann2015-02-271-1/+163
| |\
| | * fix signature checkDominik Schürmann2014-11-221-2/+2
| | * Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-222-8/+11
| | * Use master key id for keybase proof verificationDominik Schürmann2014-11-221-10/+4
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-1/+1
| | |\
| | * | Moved from WebView to Spannables, some proof cleanup tooTim Bray2014-11-071-1/+161
| * | | split up and mark unsafe expiry-related methodsVincent Breitmoser2015-02-262-4/+25
| * | | ignore revoked user ids for primary key expiryVincent Breitmoser2015-02-265-23/+82
| * | | fix comments and some warnings in PgpDecryptVerifyVincent Breitmoser2015-02-171-9/+4
| * | | determine correct filesize during decryption from LiteralData packetVincent Breitmoser2015-02-171-7/+5
| * | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-017-294/+458
| * | | Support verification of detached signaturesDominik Schürmann2015-01-271-92/+213
| * | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-272-3/+33
| |\ \ \
| | * | | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-272-3/+33
| * | | | Fixes for detached signaturesDominik Schürmann2015-01-261-9/+26
| * | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-2611-77/+582
| |\| | |
| | * | | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-259-39/+23
| | * | | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-251-0/+11
| | * | | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-252-9/+84
| | * | | allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-241-1/+1
| | * | | move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-242-25/+22
| | * | | only respect most recent signature for key flagsVincent Breitmoser2015-01-192-12/+42
| | * | | small fixes to user attribute handlingVincent Breitmoser2015-01-142-3/+26
| | * | | fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
| | * | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-144-4/+52
| | * | | hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| | * | | support addition of user attributesVincent Breitmoser2015-01-131-3/+49
| | * | | add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
| | * | | remove LinkedIdentity (committed earlier by accident)Vincent Breitmoser2015-01-131-160/+0
| | * | | add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-123-0/+335
| * | | | No output stream for detached signatures, makes no sense to pipe it throughDominik Schürmann2015-01-081-2/+1
| * | | | Experimental API support for detached signatures (not tested)Dominik Schürmann2015-01-082-20/+76
| |/ / /
* | | | linked id ui work dns/twitterVincent Breitmoser2015-01-161-0/+4
* | | | dns resource is parametrized by fqdn, class and typeVincent Breitmoser2015-01-161-4/+33
* | | | affirmation -> linked identityVincent Breitmoser2015-01-157-33/+31
* | | | work on dns resource, working (dummy) verificationVincent Breitmoser2015-01-144-52/+79
* | | | small fixes to user attribute handlingVincent Breitmoser2015-01-142-3/+26
* | | | fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
* | | | actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-144-5/+52
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 14:35:16 +0000