Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1273 

f71b067 Changed to ..._HASHBITS everywhere for consistency (NanoAkron)
This commit is contained in:
Riccardo Spagni 2016-11-01 15:01:02 +02:00
parent 703999b21a f71b06770b
commit 1e153c2fc6
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/skein.c
View File

@ -77,7 +77,7 @@ typedef struct /* 1024-bit Skein hash context stru
} Skein1024_Ctxt_t; } Skein1024_Ctxt_t;
/* Skein APIs for (incremental) "straight hashing" */ /* Skein APIs for (incremental) "straight hashing" */
#if SKEIN_256_NIST_MAX_HASH_BITS #if SKEIN_256_NIST_MAX_HASHBITS
static int Skein_256_Init (Skein_256_Ctxt_t *ctx, size_t hashBitLen); static int Skein_256_Init (Skein_256_Ctxt_t *ctx, size_t hashBitLen);
#endif #endif
static int Skein_512_Init (Skein_512_Ctxt_t *ctx, size_t hashBitLen); static int Skein_512_Init (Skein_512_Ctxt_t *ctx, size_t hashBitLen);
@ -1941,7 +1941,7 @@ static HashReturn Final (hashState *state, BitSequence *hashval);
/* select the context size and init the context */ /* select the context size and init the context */
static HashReturn Init(hashState *state, int hashbitlen) static HashReturn Init(hashState *state, int hashbitlen)
{ {
#if SKEIN_256_NIST_MAX_HASH_BITS #if SKEIN_256_NIST_MAX_HASHBITS
if (hashbitlen <= SKEIN_256_NIST_MAX_HASHBITS) if (hashbitlen <= SKEIN_256_NIST_MAX_HASHBITS)
{ {
Skein_Assert(hashbitlen > 0,BAD_HASHLEN); Skein_Assert(hashbitlen > 0,BAD_HASHLEN);