aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-06-19Merge branch 'matthew/define-secrecy' into 'master'Matthew Hodgson
explicitly define backward & forward secrecy See merge request matrix-org/olm!3
2019-06-20fix typo & more wording from lucaMatthew Hodgson
2019-06-18incorporate review from vdh & lucaMatthew Hodgson
2019-06-18explicitly define backward & forward secrecyMatthew Hodgson
as it repeatedly trips people up, including me
2019-06-12fix another incorrect commentHubert Chathi
2019-06-12use the right error in the commentHubert Chathi
2019-05-20remove megolm.rstMatthew Hodgson
2019-05-20Merge branch 'markdown' into 'master'Matthew Hodgson
Convert docs from RST to Markdown See merge request matrix-org/olm!2
2019-05-20mergeMatthew Hodgson
2019-05-20Merge branch 'master' into markdownMatthew Hodgson
2019-05-20fix thinko in megolm specMatthew Hodgson
as per https://github.com/matrix-org/olm/issues/15. thanks to @dest
2019-05-14add more consts and commentsHubert Chathi
2019-05-14Convert CONTRIBUTING.rst to markdownAaron Raimist
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-14Convert README.rst to markdownAaron Raimist
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-14Convert signing.rst to markdownAaron Raimist
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-14Convert olm.rst to markdownAaron Raimist
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-14Convert megolm.rst to markdownAaron Raimist
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-14add comment about input buffers being overwrittenHubert Chathi
also make some params const where possible
2019-04-30release 3.1.23.1.2Hubert Chathi
2019-04-30update to newer Android SDK versionBenoit Marty
2019-04-30improve some commentsBenoit Marty
2019-04-29bump version number for 3.1.13.1.1Hubert Chathi
2019-04-29avoid variable length arrays in SAS testHubert Chathi
2019-04-29update changelog for 3.1.1Hubert Chathi
2019-04-29disable test_ratchet on dynamically-linked Windows buildsHubert Chathi
2019-04-29export all symbols for Windows DLLsHubert Chathi
2019-04-29also add SAS to the tests cmakeHubert Chathi
2019-04-28Merge branch 'poljar/cmake_sas' into 'master'Hubert Chathi
cmake: Add the SAS functions to the CMake build. See merge request matrix-org/olm!1
2019-04-28cmake: Add the SAS functions to the CMake build.Damir Jelić
Signed-off-by: Damir Jelić <poljar@termina.org.uk>
2019-04-22update changelog3.1.0Hubert Chathi
2019-04-22include the C++ string library in unit testsHubert Chathi
to fix compilation errors in some compilers
2019-04-22don't use variable length or zero-length arrays in test filesHubert Chathi
as some compilers don't handle that
2019-04-22remove some debugging output from testsHubert Chathi
2019-04-19Merge pull request #89 from matrix-org/manuroe/cocoapods_updateHubert Chathi
OLMKit: Make podspec point to new https://gitlab.matrix.org/matrix-org/olm
2019-04-19OLMKit: Make podspec point to new https://gitlab.matrix.org/matrix-org/olmmanuroe
2019-04-17update changelog links to point to new repoHubert Chathi
2019-04-17prepare for 3.1.0 releaseHubert Chathi
2019-04-12Merge pull request #86 from matrix-org/add_python_pk_signingHubert Chathi
add python bindings for PK signing
2019-04-12more isortHubert Chathi
2019-04-12Merge pull request #88 from matrix-org/manuroe/sas_pksigningHubert Chathi
OLMKit: add Short Authentication String verification
2019-04-12isort python/olm/pk.pyHubert Chathi
2019-04-12OLMKit: OMLPkSigning: Zero mutableSeedmanuroe
2019-04-10OLMKit: OlmPkEncryption: Fix typos in sanity checksmanuroe
(cherry picked from commit add1bd6e4250012dcfa30a40d763dba82f53c254)
2019-04-10OLMKit: SAS: Add PK signingmanuroe
(cherry picked from commit ff31d489c68d5d9e597bd55a6f6a64f3fe4c7ecc)
2019-04-10OLMKit: SAS: Added macLongKdf supportmanuroe
(cherry picked from commit 934d516eb35c488ee197e1bab78a4c81e3c8241d)
2019-04-10OLMKit: add Short Authentication String verificationmanuroe
(cherry picked from commit 3e954ca2729d3333ea853c878602d1696f616573)
2019-04-10Fix arg name in commentsmanuroe
(cherry picked from commit c0a53ebaeda420f636698b99c393868d2bf8f905)
2019-04-10Merge branch 'python-sas'Damir Jelić
2019-04-10Merge pull request #83 from matrix-org/BillCarsonFr/java_sasValere
Java binding for SAS
2019-04-10Return string instead of byte array for b64 encoded dataValere