aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-22Merge branch 'rav/megolm_doc_format' into 'master'Hubert Chathi
Update megolm.md See merge request matrix-org/olm!6
2019-08-22Update megolm.mdRichard van der Hoff
2019-08-08Makefile: Overwrite symlinks in install and install-debugTrygve Aaberge
Without this, it's not possible to run the install or install-debug rules multiple times. Signed-off-by: Trygve Aaberge <trygveaa@gmail.com>
2019-07-03Merge branch 'python/drop-hypothesis' into 'master'Hubert Chathi
tests: Drop hypothesis from the python tests. See merge request matrix-org/olm!5
2019-07-03CMakeLists.txt: add env vars to target_include_directoriesAlexey Andreyev
2019-06-24release 3.1.33.1.3Hubert Chathi
2019-06-22Merge branch 'python/unicode_decode_errors' into 'master'Matthew Hodgson
Python unicode decode errors when decrypting. See merge request matrix-org/olm!4
2019-06-20tests: Simplify the input parameter for the Unicode decoding tests.Damir Jelić
2019-06-20tests: Use Unicode literals in the Unicode decoding tests.Damir Jelić
This is needed because the function returns Unicode strings and the comparison will fail under python2 unless Unicode literals are used.
2019-06-20tests: Simplify the sha256 tests for python.Damir Jelić
Hypothesis isn't used anymore and the strings are now constants, meaning that the hashes should never match.
2019-06-20tests: Drop hypothesis from the tests.Damir Jelić
Hypothesis recently had some problems with the typing module breaking the tox tests. Since Hypothesis isn't really used much in the test this patch removes it from them as well as from the test-requirements.
2019-06-20_compat: Make the encoding argument explicit in to_unicode_str().Damir Jelić
2019-06-20olm: Rename the errors function argument in the decryption functions.Damir Jelić
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-19_compat: Remove the now unused native_str.Damir Jelić
2019-06-19_compat: Change the to_native_str into a to_unicode_str function.Damir Jelić
The to_native_str function was supposed to produce Unicode decoded native strings for python2 and python3. Upon further consideration this doesn't make much sense since under python2 it would need to decode the bytes into a Unicode string and turn it back into a python2 str. The ability to use the replacement character requires us to use a Unicode string under python2 as well.
2019-06-19_compat: Remove unused import.Damir Jelić
2019-06-18incorporate review from vdh & lucaMatthew Hodgson
2019-06-18Makefile: Add an isort target.Damir Jelić
2019-06-18olm: Allow decryption functions to define how to handle unicode decode errors.Damir Jelić
This patch changes the decryption functions not to fail if there was an unicode decode error while converting the decrypted bytes plaintext into a native python string. Characters that cannot be decoded as unicode are now replaced with the unicode replacement character (U+FFFD). The old behaviour of raising an UnicodeDecodeError can be achieved by passing the "strict" error handling scheme to the decrypt function.
2019-06-18explicitly define backward & forward secrecyMatthew Hodgson
as it repeatedly trips people up, including me
2019-06-18compat: Add a method to convert bytes to a string that handles unicode errors.Damir Jelić
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