Commit graph

559 commits

Author SHA1 Message Date
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
Richard van der Hoff
c0c307c05e Add a CONTRIBUTING file 2017-01-17 10:07:45 +00:00
Richard van der Hoff
8fc7f47011 More README fixes 2017-01-17 10:03:13 +00:00
Richard van der Hoff
d1226e1865 link to local docs/olm.rst 2017-01-17 10:00:33 +00:00
Richard van der Hoff
199a4e7061 Fix Android build instrucitons 2017-01-17 09:59:30 +00:00
Avery Pierce
b2b93d7a1f Strip down to Foundation (no need to include UIKit or Cocoa) 2017-01-14 20:13:35 -06:00
Avery Pierce
30851905b5 Add macOS support to the Podspec 2017-01-14 14:57:46 -06:00
Richard van der Hoff
860740a91e Merge pull request #42 from matrix-org/rav/megolm_export
Export and import of megolm session data
2017-01-10 15:39:42 +00:00
Yannick LE COLLEN
14c30da0e2 Merge pull request #43 from matrix-org/pedroc/android_e2e_dev
Android wrappers for olm library
2017-01-10 16:09:18 +01:00
ylecollen
ccbb9606b7 Move the android project from /Java/Android/OlmLibSdk 2017-01-10 16:06:21 +01:00
Richard van der Hoff
c04b770cd3 Add some tests for inbound session import/export 2017-01-10 14:11:42 +00:00
ylecollen
8ea5bc7960 Merge remote-tracking branch 'origin/pedroc/android_e2e_dev' into pedroc/android_e2e_dev 2017-01-10 14:45:30 +01:00
ylecollen
03ae28e087 Update after a new review 2017-01-10 14:45:20 +01:00
Richard van der Hoff
4323bec5d6 README.rst: fix formatting 2017-01-10 11:32:52 +00:00
Richard van der Hoff
fc72c732fd Store a flag indicating if the sender key is verified 2017-01-10 10:57:14 +00:00
ylecollen
eeb210f733 -> Check the function descriptions
-> Update the deserialization methods (the jni methods create an object instance before deserializing them.
2017-01-10 11:40:57 +01:00