diff options
| author | Mattias Andrée <maandree@operamail.com> | 2013-06-17 00:42:07 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2013-06-17 00:42:07 +0200 |
| commit | 938aa55a95fda70b403fa5cabb43c6cc37292ebf (patch) | |
| tree | f77e74b2f02b38e35997182984ce2a05aeb146f3 /c/sha3sum.c | |
| parent | m + fix for python version (diff) | |
| download | sha3sum-938aa55a95fda70b403fa5cabb43c6cc37292ebf.tar.gz sha3sum-938aa55a95fda70b403fa5cabb43c6cc37292ebf.tar.bz2 sha3sum-938aa55a95fda70b403fa5cabb43c6cc37292ebf.tar.xz | |
change defaults (conflicts with Wikipedia but is based on official Keccak defaults; no defaults have yet been standardised)
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'c/sha3sum.c')
| -rw-r--r-- | c/sha3sum.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/c/sha3sum.c b/c/sha3sum.c index 8872f6d..a03f0c2 100644 --- a/c/sha3sum.c +++ b/c/sha3sum.c @@ -218,8 +218,8 @@ int main(int argc, char** argv) _o = 512; } _s = 1600; /* --statesize */ - _r = _s - (_o << 1); /* --bitrate */ - _c = _s - _r; /* --capacity */ + _c = _s - (_o << 1); /* --capacity */ + _r = _s - _c; /* --bitrate */ _w = _s / 25; /* --wordsize */ _i = 1; /* --iterations */ _j = 1; /* --squeezes */ @@ -479,7 +479,7 @@ int main(int argc, char** argv) if ((_R & _C & _O) == null) /* s? */ { s = _S ? s : _s; - r = -((c = (o = (((s << 5) / 100 + 7) >> 3) << 3) << 1) - s); + c = -((r = (o = (((s << 5) / 100 + 7) >> 3) << 3) << 1) - s); o = o < 8 ? 8 : o; } else if ((_R & _C) == null) /* !o s? */ |