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
c8c5f35b
Commit
c8c5f35b
authored
May 16, 2016
by
Richard van der Hoff
Browse files
crypto.cpp: Fix comments
These seem to be the wrong way around.
parent
acae4e84
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/crypto.cpp
View file @
c8c5f35b
...
...
@@ -298,14 +298,14 @@ void olm::hkdf_sha256(
salt
=
HKDF_DEFAULT_SALT
;
salt_length
=
sizeof
(
HKDF_DEFAULT_SALT
);
}
/* Ex
pand
*/
/* Ex
tract
*/
hmac_sha256_key
(
salt
,
salt_length
,
hmac_key
);
hmac_sha256_init
(
&
context
,
hmac_key
);
::
sha256_update
(
&
context
,
input
,
input_length
);
hmac_sha256_final
(
&
context
,
hmac_key
,
step_result
);
hmac_sha256_key
(
step_result
,
olm
::
SHA256_OUTPUT_LENGTH
,
hmac_key
);
/* Ex
tract
*/
/* Ex
pand
*/
hmac_sha256_init
(
&
context
,
hmac_key
);
::
sha256_update
(
&
context
,
info
,
info_length
);
::
sha256_update
(
&
context
,
&
iteration
,
1
);
...
...
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