Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
f3c0dd76
Commit
f3c0dd76
authored
May 24, 2016
by
Richard van der Hoff
Browse files
megolm.c: Remove spurious arguments to rehash_part
These were left over from when rehash_part did a bunch of logging.
parent
1b15465c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/megolm.c
View file @
f3c0dd76
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment