timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
982 commits 42 branches 39 tags 4.5 MiB
Commit graph

982 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
52098b3af7 Update megolm.md 2019-11-08 13:34:16 +00:00
Alexey Rusakov
baaf002663 CMakeLists.txt: export include directories in install(TARGETS) 
Without that, if olm is installed to a non-standard location, the user code might run CMake configuration fine but further building will fail.

Signed-off-by: Alexey Rusakov <Alexey.Rusakov@pm.me>
 2019-10-23 16:48:14 -04:00
Hubert Chathi
6753595300 release 3.1.4 2019-10-09 12:33:47 -04:00
Hubert Chathi
387deeea8f Merge branch 'dbkr/olm_session_describe' into 'master' 
Add olm_session_describe

See merge request matrix-org/olm!9
 2019-10-09 15:37:56 +00:00
Hubert Chathi
fc423fad15 check return value of snprintf, fix typo, add clarification 2019-10-08 17:44:09 -04:00
David Baker
b482321213 Pass in a buffer to olm_session_describe 
instead of having a static one, as that could end up taking up a
lot of memory if your app keeps olm sessions hanging about.
 2019-10-04 11:43:40 +01:00
David Baker
e73a208fb2 doc string 2019-10-01 11:18:05 +01:00
David Baker
39a1ee0b18 Add olm_session_describe 
As a way to dump the state of an olm session, ie. the chain indicies,
so we can debug why olm sessions break and get out of sync.
 2019-10-01 11:14:16 +01:00
Hubert Chathi
3568060570 Merge branch 'dbkr/emscripten_is_picky_about_pic' into 'master' 
Build the js objects without PIC

See merge request matrix-org/olm!8
 2019-09-30 13:12:38 +00:00
Hubert Chathi
44c2e47a3e Merge branch 'dbkr/wrong_comment_breaks_everything' into 'master' 
Fix comment and also js build

See merge request matrix-org/olm!7
 2019-09-30 13:08:23 +00:00
David Baker
72df5301e0 Build the js objects without PIC 
This confuses emscripten now
 2019-09-30 13:50:35 +01:00
David Baker
b83a0c0992 Fix comment and also js build 
The python that searches the header files for exports isn't smart
enough to know what is a comment and what isn't, so it picks this
up too and emscripten then complains about it being undefined.
 2019-09-30 13:19:23 +01:00
Hubert Chathi
57b6839c25 Merge branch 'rav/megolm_doc_format' into 'master' 
Update megolm.md

See merge request matrix-org/olm!6
 2019-08-22 04:30:45 +00:00
Richard van der Hoff
32f3a82bf9 Update megolm.md 2019-08-22 04:30:45 +00:00
Trygve Aaberge
e267825bb7 Makefile: Overwrite symlinks in install and install-debug 
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-08-08 09:29:14 -07:00
Hubert Chathi
c463d8b55b Merge branch 'python/drop-hypothesis' into 'master' 
tests: Drop hypothesis from the python tests.

See merge request matrix-org/olm!5
 2019-07-03 19:27:30 +00:00
Alexey Andreyev
aa0c9ab6b5 CMakeLists.txt: add env vars to target_include_directories 2019-07-03 15:24:13 -04:00
Hubert Chathi
ebd3ba6cc1 release 3.1.3 2019-06-24 17:09:41 -04:00
Matthew Hodgson
ae38f2c5a0 Merge branch 'python/unicode_decode_errors' into 'master' 
Python unicode decode errors when decrypting.

See merge request matrix-org/olm!4
 2019-06-22 17:06:02 +00:00
Damir Jelić
61175c969b tests: Simplify the input parameter for the Unicode decoding tests. 2019-06-20 14:08:21 +02:00
Damir Jelić
28350d612e tests: Use Unicode literals in the Unicode decoding tests. 
This is needed because the function returns Unicode strings and the
comparison will fail under python2 unless Unicode literals are used.
 2019-06-20 14:07:14 +02:00
Damir Jelić
5d7070d2f3 tests: Simplify the sha256 tests for python. 
Hypothesis isn't used anymore and the strings are now constants, meaning
that the hashes should never match.
 2019-06-20 13:55:03 +02:00
Damir Jelić
125c62098c tests: Drop hypothesis from the tests. 
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 13:45:33 +02:00
Damir Jelić
c4d703ac3d _compat: Make the encoding argument explicit in to_unicode_str(). 2019-06-20 12:24:08 +02:00
Damir Jelić
7538a1eccf olm: Rename the errors function argument in the decryption functions. 2019-06-20 12:16:37 +02:00
Matthew Hodgson
25662564d4 Merge branch 'matthew/define-secrecy' into 'master' 
explicitly define backward & forward secrecy

See merge request matrix-org/olm!3
 2019-06-19 23:25:56 +00:00
Matthew Hodgson
cfd1450b0e fix typo & more wording from luca 2019-06-20 00:21:47 +01:00
Damir Jelić
fec41f9540 _compat: Remove the now unused native_str. 2019-06-19 15:07:14 +02:00
Damir Jelić
5e24c605d2 _compat: Change the to_native_str into a to_unicode_str function. 
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 15:03:57 +02:00
Damir Jelić
ba65551d5f _compat: Remove unused import. 2019-06-19 14:42:58 +02:00
Matthew Hodgson
27f5c25fe8 incorporate review from vdh & luca 2019-06-18 23:47:42 +01:00
Damir Jelić
9faa100c6a Makefile: Add an isort target. 2019-06-18 13:52:02 +02:00
Damir Jelić
2f5590bf38 olm: Allow decryption functions to define how to handle unicode decode errors. 
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-18 13:50:46 +02:00
Matthew Hodgson
f8abaf9e2f explicitly define backward & forward secrecy 
as it repeatedly trips people up, including me
 2019-06-18 12:45:31 +01:00
Damir Jelić
e1a4e6ebf1 compat: Add a method to convert bytes to a string that handles unicode errors. 2019-06-18 13:44:22 +02:00
Hubert Chathi
4bb039a98e fix another incorrect comment 2019-06-12 16:22:15 -04:00
Hubert Chathi
3ed150edf7 use the right error in the comment 2019-06-12 11:22:28 -04:00
Matthew Hodgson
a18a4e8eb4 remove megolm.rst 2019-05-20 21:39:54 +01:00
Matthew Hodgson
cab1edb6da Merge branch 'markdown' into 'master' 
Convert docs from RST to Markdown

See merge request matrix-org/olm!2
 2019-05-20 20:38:57 +00:00
Matthew Hodgson
b6cd1690f2 merge 2019-05-20 21:38:16 +01:00
Matthew Hodgson
c368898cef Merge branch 'master' into markdown 2019-05-20 21:38:04 +01:00
Matthew Hodgson
214908ace5 fix thinko in megolm spec 
as per https://github.com/matrix-org/olm/issues/15.
thanks to @dest
 2019-05-20 21:16:51 +01:00
Hubert Chathi
969c8b45e5 add more consts and comments 2019-05-14 22:02:50 -04:00
Aaron Raimist
5b69a1a5cd Convert CONTRIBUTING.rst to markdown 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-14 12:57:54 -04:00
Aaron Raimist
b46ac91928 Convert README.rst to markdown 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-14 12:57:48 -04:00
Aaron Raimist
73288e6f2a Convert signing.rst to markdown 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-14 12:55:48 -04:00
Aaron Raimist
6a72cfd287 Convert olm.rst to markdown 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-14 12:55:44 -04:00
Aaron Raimist
e273189af3 Convert megolm.rst to markdown 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-14 12:55:40 -04:00
Hubert Chathi
0757e6df40 add comment about input buffers being overwritten 
also make some params const where possible
 2019-05-14 12:53:19 -04:00
Hubert Chathi
769d013ef7 release 3.1.2 2019-04-30 18:25:21 -04:00