X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fe6657c961b01ec72e9f35f4c3d96b11b31cf09c..45c0fd363937c6e9b05da04a9167e9912c05ca0c:/skipjack.c diff --git a/skipjack.c b/skipjack.c index a4c65b5..d87f22c 100644 --- a/skipjack.c +++ b/skipjack.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, @@ -48,13 +48,13 @@ static const octet f[256] = SKIPJACK_S; /* --- @skipjack_init@ --- * * - * Arguments: @skipjack_ctx *k@ = pointer to key block - * @const void *buf@ = pointer to key buffer - * @size_t sz@ = size of key material + * Arguments: @skipjack_ctx *k@ = pointer to key block + * @const void *buf@ = pointer to key buffer + * @size_t sz@ = size of key material * - * Returns: --- + * Returns: --- * - * Use: Initializes a Skipjack key buffer. The key buffer must be + * Use: Initializes a Skipjack key buffer. The key buffer must be * exactly 10 bytes long. */ @@ -74,21 +74,21 @@ void skipjack_init(skipjack_ctx *k, const void *buf, size_t sz) /* --- @skipjack_eblk@, @skipjack_dblk@ --- * * - * Arguments: @const skipjack_ctx *k@ = pointer to key block - * @const uint32 s[2]@ = pointer to source block - * @uint32 d[2]@ = pointer to skipjacktination block + * Arguments: @const skipjack_ctx *k@ = pointer to key block + * @const uint32 s[2]@ = pointer to source block + * @uint32 d[2]@ = pointer to skipjacktination block * - * Returns: --- + * Returns: --- * - * Use: Low-level block encryption and decryption. + * Use: Low-level block encryption and decryption. */ #define G(x, k) do { \ octet _x = U8(x >> 8), _y = U8(x); \ _x ^= f[_y ^ U8(k >> 24)]; \ _y ^= f[_x ^ U8(k >> 16)]; \ - _x ^= f[_y ^ U8(k >> 8)]; \ - _y ^= f[_x ^ U8(k >> 0)]; \ + _x ^= f[_y ^ U8(k >> 8)]; \ + _y ^= f[_x ^ U8(k >> 0)]; \ x = (_x << 8) | _y; \ } while (0) @@ -130,8 +130,8 @@ void skipjack_eblk(const skipjack_ctx *k, const uint32 *s, uint32 *d) #define G_INV(x, k) do { \ octet _x = U8(x >> 8), _y = U8(x); \ - _y ^= f[_x ^ U8(k >> 0)]; \ - _x ^= f[_y ^ U8(k >> 8)]; \ + _y ^= f[_x ^ U8(k >> 0)]; \ + _x ^= f[_y ^ U8(k >> 8)]; \ _y ^= f[_x ^ U8(k >> 16)]; \ _x ^= f[_y ^ U8(k >> 24)]; \ x = (_x << 8) | _y; \