cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant Argon2 algorithm ids

Browse Source
This commit is contained in:
Frank Denis 2017-06-27 16:12:07 +02:00
parent 2cb841539e
commit efd27c6489
5 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsodium/crypto_pwhash/argon2/pwhash_argon2i.c
View File

@ -19,12 +19,6 @@ crypto_pwhash_argon2i_alg_argon2i13(void)
return crypto_pwhash_argon2i_ALG_ARGON2I13; return crypto_pwhash_argon2i_ALG_ARGON2I13;
} }
int
crypto_pwhash_argon2i_alg_argon2id13(void)
{
return crypto_pwhash_argon2i_ALG_ARGON2ID13;
}
size_t size_t
crypto_pwhash_argon2i_bytes_min(void) crypto_pwhash_argon2i_bytes_min(void)
{ {

6
src/libsodium/crypto_pwhash/argon2/pwhash_argon2id.c
View File

@ -13,12 +13,6 @@
#define STR_HASHBYTES 32U #define STR_HASHBYTES 32U
int
crypto_pwhash_argon2id_alg_argon2i13(void)
{
return crypto_pwhash_argon2id_ALG_ARGON2I13;
}
int int
crypto_pwhash_argon2id_alg_argon2id13(void) crypto_pwhash_argon2id_alg_argon2id13(void)
{ {

2
src/libsodium/include/sodium/crypto_pwhash.h
View File

@ -18,7 +18,7 @@ extern "C" {
SODIUM_EXPORT SODIUM_EXPORT
int crypto_pwhash_alg_argon2i13(void); int crypto_pwhash_alg_argon2i13(void);
#define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2i_ALG_ARGON2ID13 #define crypto_pwhash_ALG_ARGON2ID13 crypto_pwhash_argon2id_ALG_ARGON2ID13
SODIUM_EXPORT SODIUM_EXPORT
int crypto_pwhash_alg_argon2id13(void); int crypto_pwhash_alg_argon2id13(void);

4
src/libsodium/include/sodium/crypto_pwhash_argon2i.h
View File

@ -18,10 +18,6 @@ extern "C" {
SODIUM_EXPORT SODIUM_EXPORT
int crypto_pwhash_argon2i_alg_argon2i13(void); int crypto_pwhash_argon2i_alg_argon2i13(void);
#define crypto_pwhash_argon2i_ALG_ARGON2ID13 2
SODIUM_EXPORT
int crypto_pwhash_argon2i_alg_argon2id13(void);
#define crypto_pwhash_argon2i_BYTES_MIN 16U #define crypto_pwhash_argon2i_BYTES_MIN 16U
SODIUM_EXPORT SODIUM_EXPORT
size_t crypto_pwhash_argon2i_bytes_min(void); size_t crypto_pwhash_argon2i_bytes_min(void);

4
src/libsodium/include/sodium/crypto_pwhash_argon2id.h
View File

@ -14,10 +14,6 @@
extern "C" { extern "C" {
#endif #endif
#define crypto_pwhash_argon2id_ALG_ARGON2I13 1
SODIUM_EXPORT
int crypto_pwhash_argon2id_alg_argon2i13(void);
#define crypto_pwhash_argon2id_ALG_ARGON2ID13 2 #define crypto_pwhash_argon2id_ALG_ARGON2ID13 2
SODIUM_EXPORT SODIUM_EXPORT
int crypto_pwhash_argon2id_alg_argon2id13(void); int crypto_pwhash_argon2id_alg_argon2id13(void);