aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto (follow)
Commit message (Expand)AuthorAgeFilesLines
* @Overrides addedtrz/merge_1.11.7lookshe2016-04-171-0/+6
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-173-10/+19
|\
| * better detect broken pepDaniel Gultsch2016-04-051-2/+9
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-4/+1
|\|
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-2/+1
| * only add image files to media scannerDaniel Gultsch2016-03-231-3/+1
| * let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-1/+1
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-55/+99
* | Fixed merge issue with AxolotlService (differentiation between impl and inter...steckbrief2016-03-083-133/+171
* | Fixes FS#151 - Missing button on image-linkslookshe2016-03-071-1/+0
* | Fixes FS#147: Disable OMEMOsteckbrief2016-03-025-951/+1275
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-7/+6
|\|
| * check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
* | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4lookshe2016-02-161-0/+25
|\|
| * re-read common name from certificates on startupDaniel Gultsch2016-02-021-0/+25
* | Imports organizedsteckbrief2016-02-124-13/+6
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-9/+6
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1114-52/+2315
|\|
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-231-0/+13
| * Fix OMEMO session creating logginAndreas Straub2015-12-311-1/+1
| * show certificate informationDaniel Gultsch2015-12-232-0/+8
| * save certificate when verifying with x509Daniel Gultsch2015-12-232-2/+10
| * store identity key in XmppAxolotlSession instead of the fingerprintDaniel Gultsch2015-12-192-23/+27
| * add more debugging to certificate checks after new omemo session was establishedDaniel Gultsch2015-12-191-0/+4
| * some more NPE checksDaniel Gultsch2015-12-101-1/+1
| * also verify sessions in CBE mode that got created by key transport messagesDaniel Gultsch2015-12-081-2/+14
| * encrypt pgp messages to selfDaniel Gultsch2015-11-261-8/+8
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-2/+10
| * Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-241-13/+29
| |\
| | * Use OpenPGP-API 9.0fiaxh2015-11-091-13/+29
| * | PgpEngine: Get account from conversation instead of from contact. fixes #1568...fiaxh2015-11-151-3/+3
| |/
| * indicate cbe in chat message hintDaniel Gultsch2015-10-311-0/+16
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-312-5/+29
| * fixed session objects not being build on start upDaniel Gultsch2015-10-301-1/+0
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-302-0/+181
| |\
| | * Decrypt PGP messages in backgroundfiaxh2015-10-282-0/+181
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-0/+1
| |/
| * don't retry building broken omemo keysDaniel Gultsch2015-10-171-4/+15
| * load axolotl session cache on first device updateDaniel Gultsch2015-10-171-2/+6
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-7/+19
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-19/+67
| * moved other name parsing into seperate methodDaniel Gultsch2015-10-151-40/+45
| * use constants for oids in xmppdomainverifierDaniel Gultsch2015-10-151-2/+5
| * more checks for xmppdomainverifier and better wildcard handlingDaniel Gultsch2015-10-151-4/+10
| * use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. fixe...Daniel Gultsch2015-10-151-0/+113
| * add config variable to enable x509 verificationDaniel Gultsch2015-10-121-3/+3
| * code clean upDaniel Gultsch2015-10-123-16/+3
| * enable SASL EXTERNAL (certificate logincbeDaniel Gultsch2015-10-111-0/+29
| * add menu item in account details to renew certificateDaniel Gultsch2015-10-111-23/+82
| * Clean upAndreas Straub2015-10-112-13/+5