Don't return the NUL-terminator in hash_encoded #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
thanks! |
Khady
added a commit
to Khady/opam-repository
that referenced
this pull request
Apr 15, 2020
CHANGES: - fix wrong length of hash encoded (Khady/ocaml-argon2#5)
samoht
pushed a commit
to ocaml/opam-repository
that referenced
this pull request
Apr 2, 2024
CHANGES: - fix wrong length of hash encoded (Khady/ocaml-argon2#5)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On further use, I noticed that
examples/examples.mlwas printing the output ofhash_encodedas though it was binary, which it's not! So I changed the example - then I noticed thathash_encodedis accidentally returning the NUL terminator from the C string.I've double-checked the C code in the reference implementation -
argon2_encodedlendefinitely requires the space for the terminator to be included and it definitely writes the final NUL.hashlendefinitely doesn't include a NUL terminator (and one is never written).I've fixed this by subtracting 1 when the string is extracted, so that
Argon2.encoded_lenstill returns the same value as the underlying C function (so it will necessarily be 1 more than the length of the OCaml string actually returned).