Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Removing argon-specific function inside blake2 library.

Browse source
This commit is contained in:
clemahieu 2017-10-28 18:22:56 -05:00
commit a2179ff9e6
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Argon2/Source/Core/argon2-core.cpp
View file

@ -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);
}

2
blake2/blake2.h
View file

@ -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)
}

4
blake2/blake2b.c
View file

@ -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 )
{