diff --git a/Argon2/Source/Core/argon2-core.cpp b/Argon2/Source/Core/argon2-core.cpp index 6b984b2f..5f502120 100644 --- a/Argon2/Source/Core/argon2-core.cpp +++ b/Argon2/Source/Core/argon2-core.cpp @@ -124,13 +124,13 @@ int blake2b_long(uint8_t *out, const void *in, const uint32_t outlen, const uint while (toproduce > BLAKE2B_OUTBYTES) { memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES); - blake2b_argon(out_buffer, in_buffer, NULL, BLAKE2B_OUTBYTES, BLAKE2B_OUTBYTES, 0); + blake2b(out_buffer, BLAKE2B_OUTBYTES, in_buffer, BLAKE2B_OUTBYTES, NULL, 0); memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2); out += BLAKE2B_OUTBYTES / 2; toproduce -= BLAKE2B_OUTBYTES / 2; } memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES); - blake2b_argon(out_buffer, in_buffer, NULL, toproduce, BLAKE2B_OUTBYTES, 0); + blake2b(out_buffer, toproduce, in_buffer, BLAKE2B_OUTBYTES, NULL, 0); memcpy(out, out_buffer, toproduce); } diff --git a/blake2/blake2.h b/blake2/blake2.h index d23c432a..ad62f260 100644 --- a/blake2/blake2.h +++ b/blake2/blake2.h @@ -187,8 +187,6 @@ extern "C" { /* This is simply an alias for blake2b */ int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void *key, size_t keylen ); - /* alias for old blake2b */ - int blake2b_argon( void *out, const void *in, const void *key, size_t outlen, size_t inlen, size_t keylen ); #if defined(__cplusplus) } diff --git a/blake2/blake2b.c b/blake2/blake2b.c index 97fcd3cd..09eb755d 100644 --- a/blake2/blake2b.c +++ b/blake2/blake2b.c @@ -314,10 +314,6 @@ int blake2( void *out, size_t outlen, const void *in, size_t inlen, const void * return blake2b(out, outlen, in, inlen, key, keylen); } -int blake2b_argon( void *out, const void *in, const void *key, size_t outlen, size_t inlen, size_t keylen ) { - return blake2b(out, outlen, in, inlen, key, keylen); -} - #if defined(SUPERCOP) int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen ) {