QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Sync argon2 implementation with upstream

Browse Source
This commit is contained in:
Frank Denis
2016-01-24 20:35:00 +01:00
parent 31a153c937
commit 367afac0bf
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_pwhash/argon2/argon2.c
+2 -2
View File
@@ -234,11 +234,11 @@ int argon2i_verify(const char *encoded, const void *pwd, const size_t pwdlen) {
return argon2_verify(encoded, pwd, pwdlen, Argon2_i);
}
int argon2i(argon2_context *context) {
int argon2i_ctx(argon2_context *context) {
return argon2_ctx(context, Argon2_i);
}
int verify_i(argon2_context *context, const char *hash) {
int argon2i_verify_ctx(argon2_context *context, const char *hash) {
int result;
if (0 == context->outlen || NULL == hash) {
return ARGON2_OUT_PTR_MISMATCH;
src/libsodium/crypto_pwhash/argon2/argon2.h
+2 -2
View File
@@ -259,7 +259,7 @@ int argon2_verify(const char *encoded, const void *pwd, const size_t pwdlen,
* @param context Pointer to current Argon2 context
* @return Zero if successful, a non zero error code otherwise
*/
int argon2i(argon2_context *context);
int argon2i_ctx(argon2_context *context);
/*
* Verify if a given password is correct for Argon2i hashing
@@ -268,6 +268,6 @@ int argon2i(argon2_context *context);
* specified by the context outlen member
* @return Zero if successful, a non zero error code otherwise
*/
int verify_i(argon2_context *context, const char *hash);
int argon2i_verify_ctx(argon2_context *context, const char *hash);
#endif