Commit Graph

4 Commits

Author SHA1 Message Date
Florian Schmaus 2b11074950 Merge branch '4.2' 2017-06-17 15:55:38 +02:00
vanitasvitae 95d2cd75ec
Reorder imports 2017-06-13 23:54:47 +02:00
vanitasvitae 3ecd01135c
Add convenience methods to HashManager 2017-06-13 23:51:57 +02:00
vanitasvitae 28f3130cf9
Add Use of Cryptographic Hashfunctions (XEP-300)
Also move bouncycastle dep from smack-omemo to
smack-experimental.
2017-06-03 00:33:56 +02:00