timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17 from matrix-org/rav/group_session_error_handling

Browse source 
Fix error handling for group sessions
This commit is contained in:
Richard van der Hoff 2016-09-06 11:07:53 +01:00 committed by GitHub
commit 8912d13b0b
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
javascript/olm_inbound_group_session.js
View file

@ -66,14 +66,14 @@ InboundGroupSession.prototype['decrypt'] = restore_stack(function(
) {
var message_array = array_from_string(message);
var message_buffer = stack(message_array);
var max_plaintext_length = session_method(
var max_plaintext_length = inbound_group_session_method(
Module['_olm_group_decrypt_max_plaintext_length']
)(this.ptr, message_buffer, message_array.length);
// caculating the length destroys the input buffer.
// So we copy the array to a new buffer
var message_buffer = stack(message_array);
var plaintext_buffer = stack(max_plaintext_length + NULL_BYTE_PADDING_LENGTH);
var plaintext_length = session_method(Module["_olm_group_decrypt"])(
var plaintext_length = inbound_group_session_method(Module["_olm_group_decrypt"])(
this.ptr,
message_buffer, message_array.length,
plaintext_buffer, max_plaintext_length

2
javascript/olm_outbound_group_session.js
View file

@ -54,7 +54,7 @@ OutboundGroupSession.prototype['unpickle'] = restore_stack(function(key, pickle)
});
OutboundGroupSession.prototype['create'] = restore_stack(function(key) {
var random_length = session_method(
var random_length = outbound_group_session_method(
Module['_olm_init_outbound_group_session_random_length']
)(this.ptr);
var random = random_stack(random_length);