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

crypto.cpp: Fix comments

Browse source 
These seem to be the wrong way around.
This commit is contained in:
Richard van der Hoff 2016-05-16 11:53:35 +01:00
parent acae4e8438
commit c8c5f35bb4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/crypto.cpp
View file

@ -298,14 +298,14 @@ void olm::hkdf_sha256(
salt = HKDF_DEFAULT_SALT; salt = HKDF_DEFAULT_SALT;
salt_length = sizeof(HKDF_DEFAULT_SALT); salt_length = sizeof(HKDF_DEFAULT_SALT);
} }
/* Expand */ /* Extract */
hmac_sha256_key(salt, salt_length, hmac_key); hmac_sha256_key(salt, salt_length, hmac_key);
hmac_sha256_init(&context, hmac_key); hmac_sha256_init(&context, hmac_key);
::sha256_update(&context, input, input_length); ::sha256_update(&context, input, input_length);
hmac_sha256_final(&context, hmac_key, step_result); hmac_sha256_final(&context, hmac_key, step_result);
hmac_sha256_key(step_result, olm::SHA256_OUTPUT_LENGTH, hmac_key); hmac_sha256_key(step_result, olm::SHA256_OUTPUT_LENGTH, hmac_key);
/* Extract */ /* Expand */
hmac_sha256_init(&context, hmac_key); hmac_sha256_init(&context, hmac_key);
::sha256_update(&context, info, info_length); ::sha256_update(&context, info, info_length);
::sha256_update(&context, &iteration, 1); ::sha256_update(&context, &iteration, 1);