Richard van der Hoff
c7a2359639
Merge commit '54d4301' into logging_enabled
2016-06-28 14:33:09 +01:00
Richard van der Hoff
02bc4ccad9
Merge commit '024685f' into logging_enabled
2016-06-28 14:32:55 +01:00
Richard van der Hoff
cd942f32c1
Merge commit '2e7800c' into logging_enabled
2016-06-28 14:32:32 +01:00
Richard van der Hoff
2f8d7ba80e
Merge commit 'b1c5732' into logging_enabled
2016-06-28 14:29:17 +01:00
Richard van der Hoff
070390e180
Merge commit 'ea130ca' into logging_enabled
2016-06-28 14:28:50 +01:00
Richard van der Hoff
ef05676dcb
Merge commit 'ff4d210' into logging_enabled
2016-06-28 14:27:56 +01:00
Richard van der Hoff
0d041f08fe
Revert "Remove functions which return strings"
...
We need these functions for the logging_enabled branch.
This reverts commit acae4e8438
2016-06-28 14:27:08 +01:00
Richard van der Hoff
4a74fd9297
Revert "Remove vestiges of logging"
...
Re-enable the logging stuff on the logging_enabled branch.
This reverts commit 2a09ccbd63
2016-06-28 14:26:07 +01:00
Richard van der Hoff
eb3bad7718
Merge commit 'acae4e8' into logging_enabled
2016-06-28 14:16:56 +01:00
Richard van der Hoff
2b7c7eef8c
Merge commit 'd37edae' into logging_enabled
2016-06-28 14:16:28 +01:00
Richard van der Hoff
54d43010c8
Merge branch 'rav/jenkins_build'
2016-05-25 15:33:33 +01:00
Mark Haines
024685f3db
Merge branch 'markjh/fuzzingII'
2016-05-25 14:32:03 +01:00
Richard van der Hoff
8d55954ce1
Avoid use of jq in test_olm
...
I want to use test_olm.sh on jenkins, which lacks jq. Hence, add support to
olm.main to get id and one-time keys individually.
2016-05-24 16:50:26 +01:00
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
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
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
Richard van der Hoff
acae4e8438
Remove functions which return strings
...
We don't want anything which does dynamic memory allocation in the library.
2016-05-20 15:07:10 +01:00
Richard van der Hoff
9ac6ab0f1c
Correct a couple of errors in the spec
...
* We only use 8-byte MACs
* The version byte is \x03, not \x01
2016-05-18 18:17:29 +01:00
