Commit graph

918 commits

Author SHA1 Message Date
pedroGitt
502de788f4 Merge remote-tracking branch 'origin/pedroc/android_e2e' into pedroc/android_e2e_dev 2016-10-13 09:36:43 +02:00
PedroGitt
f88ee7677c - Fix encrypt API (update lencrypted ength)
- Fix warning compiler
2016-10-13 00:19:47 +02:00
pedroGitt
1679c4513f Temp commit: debug in progress 2016-10-12 19:04:50 +02:00
manuroe
3cb01fd279 OLMKit: Fixed typo in test 2016-10-11 16:54:56 +02:00
pedroGitt
f2ca1ce304 - Add OlmSession unit test
- Simplify JNI function signatures definition (Account & Session)
2016-10-11 15:53:49 +02:00
manuroe
7ae6410f37 OLMKit: Add tests for OLMInboundGroupSession and OLMOutboundGroupSession 2016-10-10 18:01:02 +02:00
manuroe
2bd912990f OLMKit: Add megolm api: OLMInboundGroupSession and OLMOutboundGroupSession 2016-10-10 17:58:22 +02:00
pedroGitt
67f7939470 - Add decryptMessageJni() to olm_session.cpp API
- review comments header
- refactor utility functions
2016-10-07 17:35:27 +02:00
pedroGitt
655c841cc3 - Update Unit tests for OlmAccount
- new file olm_utility.cpp to have a stand alone function to initialize/alloc a random buffer
 - new class OlmMessage
 - complete OlmSession API with encryptMessage()
 - comments review
 - OlmAccount unit tests are green
 - new gradle to compile the shared lib according to debug mode
2016-10-06 19:55:03 +02:00
pedroGitt
0393ad6843 Update Account unit tests 2016-10-06 10:30:24 +02:00
pedroGitt
573713dd00 - Add missing file 2016-10-06 08:40:21 +02:00
pedroGitt
5573d3ab23 First commit adding Olm Lib for Android
- Add Android Studio project
2016-10-05 18:25:09 +02:00
pedroGitt
3136826e02 First commit on depo
- Add file
2016-10-05 15:31:52 +02:00
Matthew Hodgson
38acc352a3 fix missing ctypes function signatures
These missing signatures were causing OSX to truncate 64-bit pointers
to 32-bit pointers when calling the missing methods, causing segfaults
2016-10-02 02:50:52 +01:00
Matthew Hodgson
68ec41f8ca s/PCKS/PKCS/ 2016-10-02 00:48:06 +01:00
Matthew Hodgson
63800ad8e6 s/PCKS/PKCS/ 2016-10-02 00:47:29 +01:00
manuroe
2ca67ace60 OLMKit: OLMAccount: Replace a olm_session_last_error by olm_account_last_error 2016-09-30 08:16:58 +02:00
Matthew Hodgson
6d80d934cd typo 2016-09-28 18:49:56 +01:00
manuroe
45ecaaedd1 OLMKit: Add [OLMUtility ed25519Verify] 2016-09-28 16:07:39 +02:00
manuroe
f29eabde8b OLMKit: Use the same version as libolm 2016-09-28 16:06:45 +02:00
manuroe
103de50518 OLMKit: Implement missing [OLMAccount signMessage:] 2016-09-28 16:06:11 +02:00
manuroe
6f113dd7b3 OLMKit: Make the project build
Make OLMKit CocoaPods expose the obj-c wrapper of libolm
2016-09-27 14:07:30 +02:00
manuroe
1d06f2a4d9 Merge remote-tracking branch 'OLMKit/olmkit' into olmkit
# Conflicts:
#	.gitignore
#	include/olm/olm.hh
#	javascript/README.md
2016-09-27 08:30:33 +02:00
Richard van der Hoff
8a8d100ee5 Makefile: install-headers is phony 2016-09-23 12:22:34 +01:00
Emmanuel Gil Peyrot
7c9b2f6395 Add a Makefile rule to install the headers
Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
2016-09-23 12:17:44 +01:00
Richard van der Hoff
6ea9fb450e Merge branch 'rav/megolm_spec' 2016-09-23 11:55:28 +01:00
Richard van der Hoff
4049261867 megolm.rst: link to protobuf spec 2016-09-23 11:54:35 +01:00
Richard van der Hoff
6449c90d81 More review feedback 2016-09-22 18:23:43 +01:00
Richard van der Hoff
97c991ffee Merge branch 'rav/python_fixes' 2016-09-22 16:54:29 +01:00
Richard van der Hoff
b411f07df9 InboundGroupSession.init no longer requires a separate message_index 2016-09-22 16:24:03 +01:00
Richard van der Hoff
cfcee54a81 Handle non-base64 chars in pickle files 2016-09-22 15:09:40 +01:00
Richard van der Hoff
fc6688c4c8 megolm.rst: review feedback
Split ratchet algorithm out to a separate section.

Also clean up some phrasing and correct a typo or two.
2016-09-22 13:32:03 +01:00
Richard van der Hoff
182eccc624 megolm.rst: linkify Ed25519 2016-09-22 11:38:33 +01:00
Richard van der Hoff
ec91dd4570 Megolm.rst: add Background and footer 2016-09-22 11:35:23 +01:00
Richard van der Hoff
c07444d3e6 First stab at a megolm spec 2016-09-22 11:04:19 +01:00
Mark Haines
4106767fd0 Merge pull request #25 from matrix-org/markjh/fix_jenkins
Fix jenkins.sh
2016-09-16 17:38:18 +01:00
Mark Haines
8acf8fd367 Fix jenkins.sh 2016-09-16 17:34:21 +01:00
Richard van der Hoff
4ff663a0ae Merge pull request #24 from matrix-org/rav/one_time_keys_comment
Update comment on olm_account_one_time_keys
2016-09-16 14:21:15 +01:00
Richard van der Hoff
76aad9d9c3 Update comment on olm_account_one_time_keys
Document what it actually returns.
2016-09-16 14:05:48 +01:00
Mark Haines
047927d822 Fix the release instructions 2016-09-14 14:16:51 +01:00
Mark Haines
ec7d968623 Changelog and version bump for 1.3.0 2016-09-14 13:55:54 +01:00
Mark Haines
7647555fc7 Make release instructions more C+Pable 2016-09-14 11:48:15 +01:00
Mark Haines
6dfa64342a Fix the group javascript demo 2016-09-14 11:10:05 +01:00
Mark Haines
f274adfe24 Merge remote-tracking branch 'matrix/master' 2016-09-13 17:55:21 +01:00
Mark Haines
d7bc00c81d Merge pull request #23 from matrix-org/markjh/remove_message_index
Remove the messsage index from olm_init_inbound_group_session
2016-09-13 17:54:14 +01:00
Mark Haines
1a50a4b3a0 Merge pull request #22 from matrix-org/markjh/inbound_group_session_id
Add a olm_inbound_group_session_id method
2016-09-13 17:54:07 +01:00
Mark Haines
a628ef41bd Remove the messsage index from olm_init_inbound_group_session since it is read from the session_key 2016-09-13 17:51:02 +01:00
Mark Haines
71bcaa5d45 Add a test to check the equivalence of session ids for inbound and outbound sessions 2016-09-13 17:15:28 +01:00
Mark Haines
6971f54fea Add a olm_inbound_group_session_id method 2016-09-13 17:02:36 +01:00
Mark Haines
e0b51971b7 Merge pull request #21 from matrix-org/markjh/fix_session_ids
Use the ed25519 public key as the group session id.
2016-09-13 17:02:12 +01:00