diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-05-26 13:27:23 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-05-26 13:27:23 +0100 |
| commit | 09b8c3d7bc9e62760ed17575159de655e90b399b (patch) | |
| tree | 88c0554aad2a2adaf540b4a3bbfa88a0171e2602 /src/inbound_group_session.c | |
| parent | bfeb554e8699c5cb90cab14dc74e15c30f963d74 (diff) | |
| parent | 708fddd747789a101123b09b67c064b119db8873 (diff) | |
Merge remote-tracking branch 'matrix/master'
Diffstat (limited to 'src/inbound_group_session.c')
| -rw-r--r-- | src/inbound_group_session.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/inbound_group_session.c b/src/inbound_group_session.c index e171205..ce26033 100644 --- a/src/inbound_group_session.c +++ b/src/inbound_group_session.c @@ -231,9 +231,7 @@ static size_t _decrypt( return (size_t)-1; } - if (!decoded_results.has_message_index || !decoded_results.session_id - || !decoded_results.ciphertext - ) { + if (!decoded_results.has_message_index || !decoded_results.ciphertext ) { session->last_error = OLM_BAD_MESSAGE_FORMAT; return (size_t)-1; } |