aboutsummaryrefslogtreecommitdiff
path: root/include/olm
diff options
context:
space:
mode:
authorpedroGitt <pedro.contreiras@amdocs.com>2016-11-23 00:04:58 +0100
committerpedroGitt <pedro.contreiras@amdocs.com>2016-11-23 00:04:58 +0100
commit7a6897642baa8fc5d9d9f14c80fc4f201cfe2173 (patch)
tree9325a7d7d3ac40747f49af22378dcf9bc5c0dd0b /include/olm
parentc725a561a283f508e68516ded86d141214f5ea06 (diff)
parentf6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff)
Merge remote-tracking branch 'origin/master' into pedroc/android_e2e_dev
Diffstat (limited to 'include/olm')
-rw-r--r--include/olm/inbound_group_session.h3
-rw-r--r--include/olm/olm.h6
-rw-r--r--include/olm/outbound_group_session.h2
3 files changed, 7 insertions, 4 deletions
diff --git a/include/olm/inbound_group_session.h b/include/olm/inbound_group_session.h
index 59146c2..f8a0bc3 100644
--- a/include/olm/inbound_group_session.h
+++ b/include/olm/inbound_group_session.h
@@ -140,7 +140,8 @@ size_t olm_group_decrypt(
uint8_t * message, size_t message_length,
/* output */
- uint8_t * plaintext, size_t max_plaintext_length
+ uint8_t * plaintext, size_t max_plaintext_length,
+ uint32_t * message_index
);
diff --git a/include/olm/olm.h b/include/olm/olm.h
index 3257e53..5764eb2 100644
--- a/include/olm/olm.h
+++ b/include/olm/olm.h
@@ -320,7 +320,8 @@ int olm_session_has_received_message(
/** Checks if the PRE_KEY message is for this in-bound session. This can happen
* if multiple messages are sent to this account before this account sends a
- * message in reply. Returns olm_error() on failure. If the base64
+ * message in reply. Returns 1 if the session matches. Returns 0 if the session
+ * does not match. Returns olm_error() on failure. If the base64
* couldn't be decoded then olm_session_last_error will be "INVALID_BASE64".
* If the message was for an unsupported protocol version then
* olm_session_last_error() will be "BAD_MESSAGE_VERSION". If the message
@@ -333,7 +334,8 @@ size_t olm_matches_inbound_session(
/** Checks if the PRE_KEY message is for this in-bound session. This can happen
* if multiple messages are sent to this account before this account sends a
- * message in reply. Returns olm_error() on failure. If the base64
+ * message in reply. Returns 1 if the session matches. Returns 0 if the session
+ * does not match. Returns olm_error() on failure. If the base64
* couldn't be decoded then olm_session_last_error will be "INVALID_BASE64".
* If the message was for an unsupported protocol version then
* olm_session_last_error() will be "BAD_MESSAGE_VERSION". If the message
diff --git a/include/olm/outbound_group_session.h b/include/olm/outbound_group_session.h
index 90ccca3..663f1d2 100644
--- a/include/olm/outbound_group_session.h
+++ b/include/olm/outbound_group_session.h
@@ -96,7 +96,7 @@ size_t olm_init_outbound_group_session_random_length(
*/
size_t olm_init_outbound_group_session(
OlmOutboundGroupSession *session,
- uint8_t const * random, size_t random_length
+ uint8_t *random, size_t random_length
);
/**