Commit graph

878 commits

Author SHA1 Message Date
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
Richard van der Hoff
a2f0c93a93 Implement importing group session data
olm_import_inbound_group_session, which reads the format written by
olm_export_inbound_group_session to initialise a group session.
2017-01-09 17:45:46 +00:00
ylecollen
29339bc00a Update getSdkOlmVersion to provide the git commit 2017-01-09 16:39:54 +01:00
ylecollen
a14bf30c43 add sanity checks when releasing the objects 2017-01-09 15:29:23 +01:00
ylecollen
26a7ef8ddc Clear some data before releasing them 2017-01-09 15:12:15 +01:00
ylecollen
99ff3d15c8 remove the useless malloc(len+1) + zero terminated 2017-01-09 15:03:15 +01:00
ylecollen
30c8d069bc The crypto objects are now saved as String to keep the backward compliancy. 2017-01-09 13:56:41 +01:00
ylecollen
7bf7a7e415 use the same way to name the creation method i.e. createNewXX. Avoid the initWithXX. 2017-01-09 13:55:58 +01:00
ylecollen
13d3f4a1c7 The serialization / deserialization unit test did not fail when there was an error 2017-01-09 13:55:04 +01:00
ylecollen
f257580cb1 verifyEd25519Signature triggers an exception instead of filling an error buffer 2017-01-09 10:25:18 +01:00
ylecollen
0339610269 Simplify the function declarations in olm_jni to avoid having to cast the getXXX methods 2017-01-09 10:01:01 +01:00
Richard van der Hoff
5fbeb3e29b Enable exporting inbound group session keys
A pair of functions which allow you to export the megolm keys for an inbound
group session, so that an application can save/restore them.
2017-01-06 16:41:56 +00:00
ylecollen
eec8a50caf Move the exception test 2017-01-05 10:16:14 +01:00
ylecollen
90c55806c0 fix an invalid test 2017-01-05 09:42:25 +01:00
ylecollen
9df5dd9c42 The olm objects are serialized as byte[] instead of strings. 2017-01-04 18:30:35 +01:00
ylecollen
7f6a63068b Fix a C compilation warning. 2017-01-04 14:49:51 +01:00
ylecollen
4ca8086a39 OlmSession triggers exception when there is a failure. 2017-01-04 14:35:08 +01:00
ylecollen
846ea49a98 the OlmOutboundGroupSession methods trigger an exception when they fail 2017-01-04 13:13:13 +01:00
ylecollen
261c08086c the OlmInboundGroupSession methods trigger an exception when they fails 2017-01-04 12:35:15 +01:00
ylecollen
88548f687e OlmAccount methods trigger an exception when they fail. 2017-01-04 11:46:37 +01:00
ylecollen
570e8bbe93 use secureRandom in getRandomKey 2017-01-04 09:07:12 +01:00
ylecollen
ce9f67d5be Simplify the serialization / deserializtion methods (CommonSerializeUtils) 2017-01-04 08:57:41 +01:00
ylecollen
2070de4fc5 initInboundSessionWithAccount triggers an exception when it fails. 2017-01-03 17:20:18 +01:00
ylecollen
45a98c20a8 EncryptMessage triggers an exception when it fails 2017-01-03 16:41:04 +01:00
ylecollen
9552e14fda -> the byte[] to String conversions are done on Java level (when it is possible)
-> remove javaCStringToUtf8
2017-01-03 16:12:20 +01:00
ylecollen
765647cda5 There is more GetStringUTFChars call. 2017-01-03 14:14:56 +01:00
ylecollen
de962ef8d7 encryptMessage : the UTF8 conversion is done on JAVA side. 2017-01-03 11:38:43 +01:00
ylecollen
e7c7d77a8a Comments update 2017-01-03 11:04:22 +01:00
ylecollen
5e948b1ac4 Add exception checks 2017-01-03 11:04:06 +01:00
ylecollen
c8c7a8ad19 -> simplify OlmSession.DecryptMessage
-> Always use javaCStringToUtf8 to convert byte array to String
2017-01-03 10:46:56 +01:00
ylecollen
65352d05aa ->Replace 2 spaces tabs by 4 spaces.
->fix the NULL and 0 pointer comparisons mixes
2017-01-03 09:32:59 +01:00
ylecollen
b03cdebfb5 Update the tab size to 4 spaces 2017-01-02 17:10:59 +01:00