aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-24 17:03:42 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-24 17:03:42 +0100
commitf3c0dd76d73368a872d7acb2ffa293330f875089 (patch)
treebbec67746affdcacfccd2b06e897f893ad7eb115
parent1b15465c42a88f750a960a0e73f186245f9bba33 (diff)
megolm.c: Remove spurious arguments to rehash_part
These were left over from when rehash_part did a bunch of logging.
-rw-r--r--src/megolm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/megolm.c b/src/megolm.c
index 110f939..efefc11 100644
--- a/src/megolm.c
+++ b/src/megolm.c
@@ -38,8 +38,7 @@ static uint8_t HASH_KEY_SEEDS[MEGOLM_RATCHET_PARTS][HASH_KEY_SEED_LENGTH] = {
static void rehash_part(
uint8_t data[MEGOLM_RATCHET_PARTS][MEGOLM_RATCHET_PART_LENGTH],
- int rehash_from_part, int rehash_to_part,
- uint32_t old_counter, uint32_t new_counter
+ int rehash_from_part, int rehash_to_part
) {
_olm_crypto_hmac_sha256(
data[rehash_from_part],
@@ -96,7 +95,7 @@ void megolm_advance(Megolm *megolm) {
/* now update R(h)...R(3) based on R(h) */
for (i = MEGOLM_RATCHET_PARTS-1; i >= h; i--) {
- rehash_part(megolm->data, h, i, megolm->counter-1, megolm->counter);
+ rehash_part(megolm->data, h, i);
}
}
@@ -122,7 +121,7 @@ void megolm_advance_to(Megolm *megolm, uint32_t advance_to) {
* to R(j+1)...R(3).
*/
while (steps > 1) {
- rehash_part(megolm->data, j, j, megolm->counter, next_counter);
+ rehash_part(megolm->data, j, j);
megolm->counter = next_counter;
steps --;
next_counter = megolm->counter + increment;
@@ -150,7 +149,7 @@ void megolm_advance_to(Megolm *megolm, uint32_t advance_to) {
}
while (k >= j) {
- rehash_part(megolm->data, j, k, megolm->counter, next_counter);
+ rehash_part(megolm->data, j, k);
k--;
}
megolm->counter = next_counter;