aboutsummaryrefslogtreecommitdiff
path: root/src/inbound_group_session.c
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-20 12:35:59 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-24 13:40:21 +0100
commitfa1e9446ac2b4d26dd592813ce0a372565df4c93 (patch)
treed236c87d22e5ac748f158b2a4ccb99c1951583d8 /src/inbound_group_session.c
parent173cbe112c139de0bd1a69dce5a03db360dc5abc (diff)
Use _olm_unset instead of memset
memset is at risk of being optimised away, so use _olm_unset instead.
Diffstat (limited to 'src/inbound_group_session.c')
-rw-r--r--src/inbound_group_session.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/inbound_group_session.c b/src/inbound_group_session.c
index b8f762d..6cded75 100644
--- a/src/inbound_group_session.c
+++ b/src/inbound_group_session.c
@@ -21,6 +21,7 @@
#include "olm/cipher.h"
#include "olm/error.h"
#include "olm/megolm.h"
+#include "olm/memory.h"
#include "olm/message.h"
#include "olm/pickle.h"
#include "olm/pickle_encoding.h"
@@ -60,7 +61,7 @@ const char *olm_inbound_group_session_last_error(
size_t olm_clear_inbound_group_session(
OlmInboundGroupSession *session
) {
- memset(session, 0, sizeof(OlmInboundGroupSession));
+ _olm_unset(session, sizeof(OlmInboundGroupSession));
return sizeof(OlmInboundGroupSession);
}
@@ -85,7 +86,7 @@ size_t olm_init_inbound_group_session(
_olm_decode_base64(session_key, session_key_length, key_buf);
megolm_init(&session->initial_ratchet, key_buf, message_index);
megolm_init(&session->latest_ratchet, key_buf, message_index);
- memset(key_buf, 0, MEGOLM_RATCHET_LENGTH);
+ _olm_unset(key_buf, MEGOLM_RATCHET_LENGTH);
return 0;
}
@@ -265,7 +266,7 @@ size_t olm_group_decrypt(
plaintext, max_plaintext_length
);
- memset(&tmp_megolm, 0, sizeof(tmp_megolm));
+ _olm_unset(&tmp_megolm, sizeof(tmp_megolm));
if (r == (size_t)-1) {
session->last_error = OLM_BAD_MESSAGE_MAC;
return r;