Richard van der Hoff
ed039d331c
Merge branch 'master' into rav/jenkins_build
2016-05-24 16:30:23 +01:00
Richard van der Hoff
8d31f42b1e
Build the tests with -g
...
think this got lost when mark added separate release/debug builds
2016-05-24 16:28:14 +01:00
Richard van der Hoff
1b15465c42
Separate base64ing from the rest of msg encoding
...
Factor the actual message encoding/decoding and encrypting/decrypting out to
separate functions from the top-level functions which do the base64-wrangling.
This is particularly helpful in the 'outbound' code-path where the offsets
required to allow room to base64-encode make the flow hard to see when it's all inline.
2016-05-24 16:23:19 +01:00
Richard van der Hoff
a919a149fb
Update megolm_cipher as a global struct
...
Initialise megolm_cipher via the preprocessor macro, instead of with a
function.
2016-05-24 14:54:01 +01:00
Richard van der Hoff
a49d7284f3
add a script for jenkins to run
2016-05-24 14:45:32 +01:00
Richard van der Hoff
15cb4ec0c0
Build the crypto libs as C99
...
Some of the crypto libs rely on UINT64_C, which in glibc 2.17 and earlier was
not defined for C++ code (see
https://sourceware.org/bugzilla/show_bug.cgi?id=15366 ).
2016-05-24 14:41:49 +01:00
Richard van der Hoff
fa1e9446ac
Use _olm_unset instead of memset
...
memset is at risk of being optimised away, so use _olm_unset instead.
2016-05-24 13:40:21 +01:00
Richard van der Hoff
173cbe112c
Avoid relying on uint -> int casting behaviour
...
The behaviour when casting from a uint32_t which has overflowed (so has the top
bit set) to int32_t is implementation-defined, so let's avoid relying on it.
2016-05-24 13:40:21 +01:00
Richard van der Hoff
846ab858a6
Python wrapper: support for inbound group sessions
2016-05-24 13:40:21 +01:00
Richard van der Hoff
fc4756ddf1
Fix up some names, and protobuf tags
...
Make names (of session_key and message_index) more consistent.
Use our own protobuf tags rather than trying to piggyback on the one-to-one
structure.
2016-05-24 13:40:21 +01:00
Richard van der Hoff
a073d12d83
Support for pickling inbound group sessions
2016-05-24 13:40:21 +01:00
Richard van der Hoff
39ad75314b
Implement decrypting inbound group messages
...
Includes creation of inbound sessions, etc
2016-05-24 13:39:34 +01:00
Richard van der Hoff
8b1514c0a6
Implement functions to get the state of outbound session
...
We need to be able to inspect an outbound session so that we can tell our peer
how to set up an inbound session.
2016-05-24 13:39:34 +01:00
Richard van der Hoff
e545ad7eaf
Outbound group session support in the python wrappers
2016-05-24 13:39:34 +01:00
Richard van der Hoff
c058554132
Implement pickling/unpickling for outbound group sessions
2016-05-24 13:39:34 +01:00
Richard van der Hoff
caaed796ad
Implementation of an outbound group session
2016-05-24 13:39:34 +01:00
Richard van der Hoff
68d3c7bfa9
Implementation of the megolm ratchet
2016-05-24 13:39:34 +01:00
Richard van der Hoff
42a300fc62
Factor out pickle_encoding from olm.cpp
...
We don't need to have all of the top-level pickling functions in olm.cpp;
factor out the utilities to support it to pickle_encoding.cpp (and make sure
that they have plain-C bindings).
2016-05-24 13:39:32 +01:00
Richard van der Hoff
256bce10fc
Factor out olm_error_to_string to a separate file
...
I want to be able to use this functionality from elsewhere, so factor it out to
its own file.
2016-05-24 13:35:28 +01:00
Richard van der Hoff
2e7800cf65
Merge branch 'rav/c_bindings'
2016-05-24 13:33:33 +01:00
Richard van der Hoff
2fd28a6682
Rewrite _olm_cipher_aes_sha_256 initialisation
...
Replace the init-static-var dance with some preprocessor macros
2016-05-24 12:06:47 +01:00
Richard van der Hoff
d4a3c8dbaa
Remove 'destruct' from cipher_ops
...
We never delete a cipher, and the destruct op is empty, so it's a bit pointless
2016-05-24 09:56:01 +01:00
Mark Haines
b1c5732fc8
Fix bug in bounds check when parsing
2016-05-23 19:37:58 +01:00
Richard van der Hoff
444ef1f706
Prefix for internal symbols
...
Give a load of internal symbols "_olm_" prefixes. This better delineates the
public and private interfaces in the module, and helps avoid internal symbols
leaking out and possibly being abused.
2016-05-23 18:55:06 +01:00
Richard van der Hoff
c57b2b71c5
C bindings for base64 functions
2016-05-23 18:55:06 +01:00
Richard van der Hoff
a1855b99b9
C binding for olm::unset
2016-05-23 18:55:05 +01:00
Richard van der Hoff
07b33acee5
C bindings for pickle functions
2016-05-23 18:55:05 +01:00
Richard van der Hoff
294cf482ea
Convert cipher.hh to plain C
2016-05-23 18:55:05 +01:00
Richard van der Hoff
f9139dfa6a
Convert error.hh to plain C
2016-05-23 18:55:05 +01:00
Richard van der Hoff
e533b0dc8e
Give SHA256 functions C bindings
2016-05-23 18:55:05 +01:00
Richard van der Hoff
4f1bb49d20
Rename olm.hh to olm.h
2016-05-23 18:55:05 +01:00
Richard van der Hoff
182f33f8ae
Complete fixes for olm_*_last_error
...
Should have been in the previous commit :/
2016-05-23 18:54:18 +01:00
Richard van der Hoff
f69577ad99
fix range check in olm_*_last_errror
2016-05-23 18:53:14 +01:00
Richard van der Hoff
e21d5cb222
Fix warnings and set -Werror
2016-05-23 18:08:22 +01:00
Richard van der Hoff
ea130cae0d
Merge branch 'rav/refactor_python_wrappers'
2016-05-23 18:03:32 +01:00
Mark Haines
f47aabd094
Add support for building fuzzers using american fuzzy lop
...
Builds fuzzers using http://lcamtuf.coredump.cx/afl/
2016-05-23 17:32:24 +01:00
Mark Haines
aacf115468
Fix make clean to remove the library and all the .d files
2016-05-23 16:35:34 +01:00
Mark Haines
502bd9e10e
Move comment to correct location
2016-05-23 16:31:33 +01:00
Mark Haines
2e986c512e
Don't use $^ cause that includes the header files
2016-05-23 16:23:57 +01:00
Mark Haines
83ce82708e
Use a rule to make the build directories
2016-05-23 16:21:37 +01:00
Mark Haines
509be1b1bf
Put the .o files in separate directories so we can have both release and debug versions
2016-05-23 15:58:18 +01:00
Mark Haines
63265f10de
Fix the Makefile so that it works with a clean git checkout
2016-05-20 17:44:44 +01:00
Richard van der Hoff
ff4d210d05
Merge branch 'rav/makefile'
2016-05-20 16:52:01 +01:00
Richard van der Hoff
ab7610087a
Remove dep files for js objects on clean
2016-05-20 16:50:14 +01:00
Richard van der Hoff
c8c5f35bb4
crypto.cpp: Fix comments
...
These seem to be the wrong way around.
2016-05-20 15:37:33 +01:00
Richard van der Hoff
85f2d57e08
Add an 'all' target to the Makefile
...
So that we can build everything together.
2016-05-20 15:28:54 +01:00
Richard van der Hoff
7ccaae564a
Refactor python wrappers
...
Split the python wrappers into separate modules
2016-05-20 15:25:43 +01:00
Richard van der Hoff
488567a45f
Use a version script to restrict symbols in the .so
...
We want to stop aes_* and sha_* functions leaking out of our .so, as well as
internal _olm_* symbols.
This also means we need to link the unit tests against the objects. Possibly we
should distinguish between unit tests and integration tests.
2016-05-20 15:15:40 +01:00
Richard van der Hoff
d4c8aae803
Add support for building the JS wrappers to the Makefile
...
Now that we have C and C++, we need to split the compile and link steps
(because we need different flags for the C and C++ files), so this is
easier with a Makefile.
2016-05-20 15:15:40 +01:00
Richard van der Hoff
b3a7a6b36c
Add a makefile
...
Replace the python scripts for building the shared lib and tests with a
Makefile, which makes it easier to handle a mix of C and C++.
2016-05-20 15:15:40 +01:00