diff options
| author | manuroe <manu@matrix.org> | 2016-11-07 17:21:39 +0100 |
|---|---|---|
| committer | manuroe <manu@matrix.org> | 2016-11-07 17:21:39 +0100 |
| commit | 5d1b66c350ac017613982f904b896750766654de (patch) | |
| tree | a290c557e7881f7eb48cbdd568a4f3e43cb749c6 /include/olm/olm.h | |
| parent | 62f52806702b799b9e25e7cdf07be1c8a31325a2 (diff) | |
| parent | f6c05be8c5d35e725a8a2ed5ad661398ac9f8cd2 (diff) | |
Merge remote-tracking branch 'origin/master' into olmkit
Diffstat (limited to 'include/olm/olm.h')
| -rw-r--r-- | include/olm/olm.h | 6 |
1 files changed, 4 insertions, 2 deletions
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 |