diff --git a/guide.md b/guide.md index 7c77d31..754f9cb 100644 --- a/guide.md +++ b/guide.md @@ -1497,7 +1497,7 @@ Here are some examples: - Password Storage: - Prefer: Argon2, scrypt - - If these aren't options, use bcrypt, or if not possible at least PBKDF2 (only as a last resort)f + - If these aren't options, use bcrypt, or if not possible at least PBKDF2 (only as a last resort) - Be skeptical of Argon2d, as it's vulnerable to some forms of side-channels. Prefer Argon2i or Argon2id - Avoid: SHA-3, SHA-2, SHA-1, MD5 @@ -10451,7 +10451,7 @@ This is because they do not prevent Collision[^478] well enough and could allow For this reason, it is usually recommended to use SHA-based[^479] hashes and the most used is probably the SHA-2[^480] based SHA-256 for verifying file integrity. SHA is much more resistant to collisions[^481] than CRC and MD5. And collisions with SHA-256 or SHA-512 are rare and hard to compute for an adversary. -If a SHA-256 checksum is available from the source of the file, you should not hesitate to use it to confirm the integrity of the file. *Note: SHA-1 is not recommended.* +If a SHA-256 checksum is available from the source of the file, you should not hesitate to use it to confirm the integrity of the file. Note that SHA-1 is not recommended, but is better than not having a hash to compare. This checksum should itself be authenticated/trusted and should be available from an authenticated/trusted source (obviously you should not trust a file just because it has a checksum attached to it alone).