mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity
1,039 Commits
42 Branches
39 Tags
4.4 MiB
Commit Graph

1039 Commits (master)

Author SHA1 Message Date
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
Benoit Marty 69feb86c01 update to newer Android SDK version 2019-04-30 18:22:30 -04:00
Benoit Marty 27fcc337a3 improve some comments 2019-04-30 18:19:26 -04:00
Hubert Chathi 6aafd69f8f bump version number for 3.1.1 2019-04-29 15:01:09 -04:00
Hubert Chathi 38649855f7 avoid variable length arrays in SAS test 2019-04-29 14:49:47 -04:00
Hubert Chathi af47497ace update changelog for 3.1.1 2019-04-29 14:35:15 -04:00
Hubert Chathi ba1c20d6b4 disable test_ratchet on dynamically-linked Windows builds 2019-04-29 13:32:46 -04:00
Hubert Chathi b79c6d6f69 export all symbols for Windows DLLs 2019-04-29 13:11:48 -04:00
Hubert Chathi 099b3ce82a also add SAS to the tests cmake 2019-04-29 11:47:55 -04:00
Hubert Chathi 327d6ac0eb Merge branch 'poljar/cmake_sas' into 'master' 
cmake: Add the SAS functions to the CMake build.

See merge request matrix-org/olm!1
 2019-04-28 11:35:58 +00:00
Damir Jelić 6eca9f1278 cmake: Add the SAS functions to the CMake build. 
Signed-off-by: Damir Jelić <poljar@termina.org.uk>
 2019-04-28 08:55:40 +02:00
Hubert Chathi 992323c37c update changelog 2019-04-22 13:17:30 -04:00
Hubert Chathi 8ec6387615 include the C++ string library in unit tests 
to fix compilation errors in some compilers
 2019-04-22 13:14:39 -04:00
Hubert Chathi ea13edcae0 don't use variable length or zero-length arrays in test files 
as some compilers don't handle that
 2019-04-22 10:12:42 -04:00
Hubert Chathi 157c0fa67e remove some debugging output from tests 2019-04-22 10:11:43 -04:00
Hubert Chathi 5832e85691
Merge pull request #89 from matrix-org/manuroe/cocoapods_update 
OLMKit: Make podspec point to new https://gitlab.matrix.org/matrix-org/olm
 2019-04-19 08:02:23 -04:00
manuroe 51ce62fce0 OLMKit: Make podspec point to new https://gitlab.matrix.org/matrix-org/olm 2019-04-19 11:59:22 +02:00
Hubert Chathi 009173c1ab update changelog links to point to new repo 2019-04-17 21:09:03 -04:00
Hubert Chathi bac8ca7802 prepare for 3.1.0 release 2019-04-17 17:31:01 -04:00
Hubert Chathi 0d0169c839
Merge pull request #86 from matrix-org/add_python_pk_signing 
add python bindings for PK signing
 2019-04-12 19:21:17 -04:00
Hubert Chathi ab6e8d5086 more isort 2019-04-12 19:17:06 -04:00
Hubert Chathi b12fe0aeb3
Merge pull request #88 from matrix-org/manuroe/sas_pksigning 
OLMKit: add Short Authentication String verification
 2019-04-12 19:04:09 -04:00
Hubert Chathi 107adba241 isort python/olm/pk.py 2019-04-12 13:02:57 -04:00
manuroe 5147349fea OLMKit: OMLPkSigning: Zero mutableSeed 2019-04-12 11:17:53 +02:00
manuroe 89357b6a49 OLMKit: OlmPkEncryption: Fix typos in sanity checks 
(cherry picked from commit add1bd6e4250012dcfa30a40d763dba82f53c254)
 2019-04-10 23:27:27 +02:00
manuroe 809793c9ba OLMKit: SAS: Add PK signing 
(cherry picked from commit ff31d489c68d5d9e597bd55a6f6a64f3fe4c7ecc)
 2019-04-10 23:27:14 +02:00
manuroe 4057f59453 OLMKit: SAS: Added macLongKdf support 
(cherry picked from commit 934d516eb35c488ee197e1bab78a4c81e3c8241d)
 2019-04-10 23:27:00 +02:00
manuroe 5de295da3e OLMKit: add Short Authentication String verification 
(cherry picked from commit 3e954ca2729d3333ea853c878602d1696f616573)
 2019-04-10 23:26:02 +02:00
manuroe 3609227c6e Fix arg name in comments 
(cherry picked from commit c0a53ebaeda420f636698b99c393868d2bf8f905)
 2019-04-10 23:26:02 +02:00
Damir Jelić 086133f39a Merge branch 'python-sas' 2019-04-10 15:18:07 +02:00
Valere c79d9282dc
Merge pull request #83 from matrix-org/BillCarsonFr/java_sas 
Java binding for SAS
 2019-04-10 14:03:49 +02:00
Valere eb7347bb52 Return string instead of byte array for b64 encoded data 2019-04-10 12:24:00 +02:00
Valere 16a28f297c Added macLongKdf support 2019-04-10 12:24:00 +02:00
Valere c9369a4383 E2E: SAS Verification (olm) 
Fix / missing free() on some errors


Added doc regarding string encoding for keys


cleaning
 2019-04-10 12:24:00 +02:00
Damir Jelić 54cb52e05e python: Add the SAS header to the manifest. 
The SAS header is required to build the package therefore it needs to be
shipped with the source distribution of the package.

Adding it to the manifest achieves this.
 2019-04-09 11:41:44 +02:00
Damir Jelić 32b99b7935 python: Add support for the long KDF MAC calculation. 2019-04-09 10:57:36 +02:00
Damir Jelić 659eb34fa4 python: Remove an unneeded and old copyright header. 2019-04-09 10:47:26 +02:00
Hubert Chathi 74e9300daf add python bindings for PK signing 2019-04-08 17:19:47 -04:00
Hubert Chathi ebc156e7c2 re-add null termination in javascript 
because older versions of emscripten don't support the length argument to
UTF8ToString.
 2019-04-08 15:54:02 -04:00
Damir Jelić 071029c201 javascript: Switch from deprecated Pointer_stringify() to UTF8toString(). 
The Pointer_stringify() function is deprecated and has a couple of
issues because it tries to guess the encoding of the buffer. In some
cases it can ignore the length parameter which could end up in
inconsistencies.

Switch to UTF8toString() that takes a length parameter and respects,
that way we don't need to allocate an additional byte for a NULL byte.
 2019-04-08 15:18:28 -04:00
Hubert Chathi 2a6400716c
Merge branch 'master' into poljar/python-sas 2019-04-08 15:08:17 -04:00
Damir Jelić 709687a7b5 python: Build the build headers with setup.py. 
This allows downstream users to install this python module with pip as
well as allowing people to declare it as a dependency in their setup.py.

Signed-off-by: Damir Jelić <poljar@termina.org.uk>
 2019-04-08 15:04:32 -04:00
Damir Jelić f1d45c2cd3 python: Fix the MANIFEST file. 
This patch adds the Olm header files to the manifest, this results in
the header files being added to source distributions of the python-olm
module.

The headers are required to build the module. Including them in the
source distribution is the easiest way to make sure that builds from the
source distribution will succeed provided that the Olm C library is
already installed.

Signed-off-by: Damir Jelić <poljar@termina.org.uk>
 2019-04-08 15:04:32 -04:00
Damir Jelić f160d693b6 python: Add PK bindings. 
This patch adds bindings to the PK part of the Olm library contained in
the pk.h header file.

Encryption, decryption as well as pickling/unpickling of the decryption
object is supported.

Signed-off-by: Damir Jelić <poljar@termina.org.uk>
 2019-04-08 15:04:32 -04:00