aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/crypto (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add auth method pinningSam Whited2014-11-154-3/+30
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-151-22/+5
|\
| * some mime and pgp fixes for file transferiNPUTmice2014-11-151-20/+1
| * support for pgp filesiNPUTmice2014-11-151-2/+4
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-151-17/+55
|\ \ | |/ |/|
| * initial smp supportiNPUTmice2014-11-111-17/+55
* | Improve auth error handling and state machineSam Whited2014-11-154-32/+36
* | Add SCRAM-SHA1 supportSam Whited2014-11-146-80/+375
* | Refactor authentication codeSam Whited2014-11-123-0/+124
|/
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-092-8/+8
* Move a chunk of classes over to using JID objectsSam Whited2014-11-092-33/+17
* Merge branch 'gradle' into developmentSam Whited2014-10-301-18/+27
* Make conversations the root projectSam Whited2014-10-222-0/+616