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

574 Commits (28e0c4baca4c380c3bfcee9f4ed71aa0503edde5)

Author SHA1 Message Date
Benoit Marty 28e0c4baca Improve .gitignore: exclude generated files for test 2018-06-27 14:00:20 -04:00
Benoit Marty 6f2145337b Comment out proxy settings 2018-06-27 14:00:20 -04:00
Benoit Marty 44c5923522 Upgrade tools 
gradle 2.14.1 to 4.7
build tools 21.1.2 to 27.0.3
build gradle 2.1.3 to 3.1.3
 2018-06-27 14:00:20 -04:00
Benoit Marty ed7649d71e Compiling with last NDK + some hardening 
Patch received in https://github.com/matrix-org/olm/issues/13
 2018-06-27 14:00:20 -04:00
Benoit Marty 08e50693b7 ignore generated files 2018-06-27 14:00:20 -04:00
Benoit Marty 9550d6cebc Fix null pointer dereference 
Patch has been received by e-mail, Signed-off-by: Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
 2018-06-27 14:00:20 -04:00
Benoit Marty 570e3a706f Add a .gitignore file specific for Android project 2018-06-27 14:00:20 -04:00
manuroe 36fd68c818 OLMAccount: Fix use of object after its memory was released 2018-06-27 12:26:44 -04:00
manuroe 20ee3858b9 Update Xcode test project 2018-06-27 12:26:26 -04:00
manuroe 2e84f7552a Fix obj-c warnings 2018-06-27 12:26:01 -04:00
manuroe 9d81046f90 Fix warnings reported by LLVM 2018-06-27 12:25:27 -04:00
Hubert Chathi ddc981c475 fix a length check and add some missing length checks 2018-06-27 12:14:19 -04:00
Richard van der Hoff 6d86835421 Update releasing instructions 2018-06-22 13:58:48 +01:00
Wilfried Klaebe 62b576b903 Python: add binding for olm_remove_one_time_keys 
Signed-off-by: Wilfried Klaebe <w+gitstuff@chaos.in-kiel.de>
 2018-05-29 11:41:25 +01:00
MTRNord 4065c8e11a Update Makefile to support building on Windows 
The code for this change is taken from
https://stackoverflow.com/a/30225575/4929236

This patch is Signed-Off-By: Marcel Radzio <marcel@radzio-sh.de>
 2018-04-12 10:51:16 +01:00
Hubert Chathi 3f5b9dd6d7 patch for libolm: fix some typos in JavaScript library 
From 4a82d31e8cb808a04956fc847ed0ec0ff322b956 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 3 Jan 2018 21:37:43 -0500
Subject: [PATCH] fix some typos in JavaScript library

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2018-01-09 15:57:47 +00:00
Richard van der Hoff 18b067a46f jenkins.sh: Run python bits in a virtualenv 
because we may not have pep8 installed at the system level
 2017-11-22 16:57:50 +00:00
Alexey Rusakov 0fd406cca8 Drop unused #include 
Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>
 2017-09-29 09:35:04 +01:00
Alexey Rusakov 3c33180fe3 Avoid C99 inside C++ code 
This disrupts building at least with Visual Studio.

Signed-off-by: Alexey Rusakov <ktirf@users.sf.net>
 2017-09-29 09:35:04 +01:00
Hubert Chathi 0fd768e1b5 update link in README to match changes in 780d83a 
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2017-06-08 11:31:39 +01:00
Eli Flanagan 780d83a1d8 update link 2017-06-07 10:10:39 +01:00
Matthew Hodgson b7dcbfdf64 add audit notes 2017-05-08 11:35:50 +01:00
Richard van der Hoff 7de2931509 Enforce PEP8 in jenins build 2017-04-24 13:14:46 +01:00
Richard van der Hoff f8c61b8f84 Python: Make ed25519_verify take some arguments 
It's not much use if everything is hardcoded.
 2017-04-24 13:14:36 +01:00
Richard van der Hoff 853ea8fbc7 Merge branch 'master' 
Merge master into patched branch to fix conflicts prior to merge back to master
 2017-04-24 12:35:17 +01:00
Richard van der Hoff 1225de14d7 PEP8 
Fix line lengths in newly-added code
 2017-04-24 12:34:28 +01:00
pik a3e5beab89 Add ed25519_verify to __init__.py and add test for ed25519_verify 
Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>
 2017-04-24 12:29:45 +01:00
pik e632bc9e52 Add utility module to olm/python - for ed25519_verify 
Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>
 2017-04-24 12:29:45 +01:00
pik 51840d82dc Return python int instead of c_uint32 for InboundGroupSession.decrypt message_index 
Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>
 2017-04-18 19:15:51 +01:00
Richard van der Hoff ed6ebb9a4d PEP8 for python bindings 
make the python code adhere to PEP8
 2017-04-18 19:07:56 +01:00
J08nY 001dc1edaa Python: Switch to a more general os.urandom for randomness source 
Signed-off-by: Jan Jancar <johny@neuromancer.sk>
 2017-04-04 10:45:11 +01:00
Richard van der Hoff bb05b5687f Makefile: fix tab/space substitution. 2017-03-29 10:44:54 +01:00
Andreas Zwinkau b0a010b153 Support building as a static library 
Signed-off-by: Andreas Zwinkau <qznc@web.de>
 2017-03-24 10:20:49 +00:00
Matthew Hodgson 793cec0268 bug reports 2017-03-13 11:55:33 +00:00
Sophie Taylor 7b937236ae Fixing Android.mk 
Signed-off-by: Sophie Taylor <sophie@spacekitteh.moe>
 2017-03-06 14:12:57 +00:00
Yannick LE COLLEN a9aeb6b5d7 Android : improve the version number management (#46) 
Add functions to make the difference between the native and the java code version.

Factor out the version management in the makefiles.
 2017-03-02 12:01:32 +00:00
Richard van der Hoff 77eaaa3d5f prepare v2.2.2 2017-03-01 16:21:37 +00:00
Greg Hughes 86c6af943a OLMKit: Fixed type of messageIndex argument in exportSessionAtMessageIndex 
Signed-off-by: Greg Hughes <greg@ghughes.com>
 2017-02-27 17:24:17 +00:00
Richard van der Hoff b185229c2b Prep v2.2.1 2017-01-18 18:16:32 +00:00
Richard van der Hoff 1014712fd0 Fix OLMKit.podspec 2017-01-18 18:02:11 +00:00
Richard van der Hoff 150c360e82 Bump version numbers to 2.2.0 2017-01-18 16:03:02 +00:00
Richard van der Hoff 972798d1b7 Prep changelog for 2.2.0 2017-01-18 15:48:48 +00:00
Yannick LE COLLEN 3c02c1547c Android: Add wrappers for export/import of inbound group sessions 2017-01-18 14:33:14 +00:00
Richard van der Hoff 1761730db8 Swift project support 
Merge patch required to support Swift projects, from Avery Pierce.

Patch taken from https://github.com/matrix-org/matrix-ios-sdk/files/712987/olm_patch.txt.

Sign-off at https://github.com/matrix-org/matrix-ios-sdk/pull/220#issue-201470911.
 2017-01-18 10:46:59 +00:00
Avery Pierce 757be9aeba OLMKit: Change OLMKitVersionString from a C function to an Obj-C static method 2017-01-18 10:46:37 +00:00
Avery Pierce 4373ac3ef6 OLMKit: Exclude private headers from pod library 2017-01-18 10:46:37 +00:00
Richard van der Hoff a45c3cc809 Merge pull request #44 from matrix-org/manuroe/olmkit-backup 
OLMKit: Add wrappers for export/import of inbound group sessions
 2017-01-17 15:16:16 +00:00
manuroe ded15597c6 OLMKit: Reset intermediate buffer to zeroes 2017-01-17 16:14:22 +01:00
manuroe 885b85f516 OLMKit: Add wrappers for export/import of inbound group sessions 2017-01-17 14:47:41 +01:00
Richard van der Hoff c14f4b28b9 Update podspec to support macOS 
Merged from https://github.com/aapierce0/OLMKit/commits/macOS_port

Sign-off taken from https://github.com/matrix-org/matrix-ios-sdk/pull/218#issue-201062079.
 2017-01-17 10:08:50 +00:00