Resolved conflict between argon2 implementations.
This commit is contained in:
parent
0c25424a3e
commit
043989e8ee
45 changed files with 160 additions and 163 deletions
|
@ -85,16 +85,14 @@ extern "C" {
|
|||
};
|
||||
|
||||
/* Streaming API */
|
||||
int blake2b_init(blake2b_state *S, size_t outlen);
|
||||
int blake2b_init_key(blake2b_state *S, size_t outlen, const void *key,
|
||||
size_t keylen);
|
||||
int blake2b_init_param(blake2b_state *S, const blake2b_param *P);
|
||||
int blake2b_update(blake2b_state *S, const void *in, size_t inlen);
|
||||
int blake2b_final(blake2b_state *S, void *out, size_t outlen);
|
||||
int rx_blake2b_init(blake2b_state *S, size_t outlen);
|
||||
int rx_blake2b_init_key(blake2b_state *S, size_t outlen, const void *key, size_t keylen);
|
||||
int rx_blake2b_init_param(blake2b_state *S, const blake2b_param *P);
|
||||
int rx_blake2b_update(blake2b_state *S, const void *in, size_t inlen);
|
||||
int rx_blake2b_final(blake2b_state *S, void *out, size_t outlen);
|
||||
|
||||
/* Simple API */
|
||||
int blake2b(void *out, size_t outlen, const void *in, size_t inlen,
|
||||
const void *key, size_t keylen);
|
||||
int rx_blake2b(void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen);
|
||||
|
||||
/* Argon2 Team - Begin Code */
|
||||
int rxa2_blake2b_long(void *out, size_t outlen, const void *in, size_t inlen);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue