diff --git a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c index 567895d8..d93daee1 100644 --- a/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c +++ b/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c @@ -29,7 +29,7 @@ fill_block(const block *prev_block, const block *ref_block, block *next_block) copy_block(&blockR, ref_block); xor_block(&blockR, prev_block); copy_block(&block_tmp, &blockR); - /* Now blockR = ref_block + prev_block and bloc_tmp = ref_block + prev_block + /* Now blockR = ref_block + prev_block and block_tmp = ref_block + prev_block Apply Blake2 on columns of 64-bit words: (0,1,...,15), then (16,17,..31)... finally (112,113,...127) */ for (i = 0; i < 8; ++i) { @@ -70,7 +70,7 @@ fill_block_with_xor(const block *prev_block, const block *ref_block, copy_block(&block_tmp, &blockR); xor_block(&block_tmp, next_block); /* Saving the next block contents for XOR over */ - /* Now blockR = ref_block + prev_block and bloc_tmp = ref_block + prev_block + /* Now blockR = ref_block + prev_block and block_tmp = ref_block + prev_block * + next_block */ /* Apply Blake2 on columns of 64-bit words: (0,1,...,15) , then (16,17,..31)... finally (112,113,...127) */ diff --git a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c index d653b21f..a9a52c91 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c +++ b/src/libsodium/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c @@ -1,8 +1,8 @@ /* This file is adapted from ref10/scalarmult.c: - The code for Mongomery ladder is replace by the ladder assembly function; + The code for Montgomery ladder is replaced by the ladder assembly function; Inversion is done in the same way as amd64-51/. - (fe is first converted into fe51 after Mongomery ladder) + (fe is first converted into fe51 after Montgomery ladder) */ #include diff --git a/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h b/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h index 66edbf6a..0ae1cf2f 100644 --- a/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h +++ b/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h @@ -1,6 +1,6 @@ -#ifndef scalarmult_poly1305_H -#define scalarmult_poly1305_H +#ifndef scalarmult_curve25519_H +#define scalarmult_curve25519_H typedef struct crypto_scalarmult_curve25519_implementation { int (*mult)(unsigned char *q, const unsigned char *n, diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h index c47982af..f8311b2e 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha256.h +++ b/src/libsodium/include/sodium/crypto_hash_sha256.h @@ -2,7 +2,7 @@ #define crypto_hash_sha256_H /* - * WARNING: Unless you absolutely need to use SHA256 for interoperability, + * WARNING: Unless you absolutely need to use SHA256 for interoperability * purposes, you might want to consider crypto_generichash() instead. * Unlike SHA256, crypto_generichash() is not vulnerable to length * extension attacks. diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h index 5b690fb2..1628901c 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha512.h +++ b/src/libsodium/include/sodium/crypto_hash_sha512.h @@ -2,7 +2,7 @@ #define crypto_hash_sha512_H /* - * WARNING: Unless you absolutely need to use SHA512 for interoperability, + * WARNING: Unless you absolutely need to use SHA512 for interoperability * purposes, you might want to consider crypto_generichash() instead. * Unlike SHA512, crypto_generichash() is not vulnerable to length * extension attacks.