X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fe6657c961b01ec72e9f35f4c3d96b11b31cf09c..45c0fd363937c6e9b05da04a9167e9912c05ca0c:/twofish.c diff --git a/twofish.c b/twofish.c index e70ad12..ad4882f 100644 --- a/twofish.c +++ b/twofish.c @@ -7,7 +7,7 @@ * (c) 2000 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,12 +15,12 @@ * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 of the * License, or (at your option) any later version. - * + * * Catacomb is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details. - * + * * You should have received a copy of the GNU Library General Public * License along with Catacomb; if not, write to the Free * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, @@ -68,8 +68,8 @@ static uint32 h(uint32 x, const uint32 *l, unsigned k) /* --- Apply a series of @q@ tables to an integer --- */ # define Q(x, qa, qb, qc, qd) \ - ((qa[((x) >> 0) & 0xff] << 0) | \ - (qb[((x) >> 8) & 0xff] << 8) | \ + ((qa[((x) >> 0) & 0xff] << 0) | \ + (qb[((x) >> 8) & 0xff] << 8) | \ (qc[((x) >> 16) & 0xff] << 16) | \ (qd[((x) >> 24) & 0xff] << 24)) @@ -178,7 +178,7 @@ void twofish_initfk(twofish_ctx *k, const void *buf, size_t sz, qq++; r++; } - + s[j][sz - 1 - i] = ss[j] = a; } q += 8; @@ -321,12 +321,12 @@ void twofish_fkinit(twofish_fk *fk, const void *buf, size_t sz) /* --- Feistel function --- */ #define GG(k, t0, t1, x, y, kk) do { \ - t0 = (k->g[0][U8(x >> 0)] ^ \ - k->g[1][U8(x >> 8)] ^ \ + t0 = (k->g[0][U8(x >> 0)] ^ \ + k->g[1][U8(x >> 8)] ^ \ k->g[2][U8(x >> 16)] ^ \ k->g[3][U8(x >> 24)]); \ - t1 = (k->g[1][U8(y >> 0)] ^ \ - k->g[2][U8(y >> 8)] ^ \ + t1 = (k->g[1][U8(y >> 0)] ^ \ + k->g[2][U8(y >> 8)] ^ \ k->g[3][U8(y >> 16)] ^ \ k->g[0][U8(y >> 24)]); \ t0 += t1; \