X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/fe6657c961b01ec72e9f35f4c3d96b11b31cf09c..45c0fd363937c6e9b05da04a9167e9912c05ca0c:/rmd320.c diff --git a/rmd320.c b/rmd320.c index ed38f15..a91f874 100644 --- a/rmd320.c +++ b/rmd320.c @@ -7,7 +7,7 @@ * (c) 1998 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, @@ -109,19 +109,19 @@ void rmd320_compress(rmd320_ctx *ctx, const void *sbuf) F1(e, a, b, c, d, 1, 14); F1(d, e, a, b, c, 2, 15); F1(c, d, e, a, b, 3, 12); - F1(b, c, d, e, a, 4, 5); - F1(a, b, c, d, e, 5, 8); - F1(e, a, b, c, d, 6, 7); - F1(d, e, a, b, c, 7, 9); + F1(b, c, d, e, a, 4, 5); + F1(a, b, c, d, e, 5, 8); + F1(e, a, b, c, d, 6, 7); + F1(d, e, a, b, c, 7, 9); F1(c, d, e, a, b, 8, 11); F1(b, c, d, e, a, 9, 13); F1(a, b, c, d, e, 10, 14); F1(e, a, b, c, d, 11, 15); - F1(d, e, a, b, c, 12, 6); - F1(c, d, e, a, b, 13, 7); - F1(b, c, d, e, a, 14, 9); - F1(a, b, c, d, e, 15, 8); - + F1(d, e, a, b, c, 12, 6); + F1(c, d, e, a, b, 13, 7); + F1(b, c, d, e, a, 14, 9); + F1(a, b, c, d, e, 15, 8); + F2(A, B, C, D, E, 5, 8); F2(E, A, B, C, D, 14, 9); F2(D, E, A, B, C, 7, 9); @@ -155,7 +155,7 @@ void rmd320_compress(rmd320_ctx *ctx, const void *sbuf) G1(b, c, d, e, A, 14, 7); G1(A, b, c, d, e, 11, 13); G1(e, A, b, c, d, 8, 12); - + G2(E, a, B, C, D, 6, 9); G2(D, E, a, B, C, 11, 13); G2(C, D, E, a, B, 3, 15); @@ -172,7 +172,7 @@ void rmd320_compress(rmd320_ctx *ctx, const void *sbuf) G2(B, C, D, E, a, 9, 15); G2(a, B, C, D, E, 1, 13); G2(E, a, B, C, D, 2, 11); - + H1(d, e, A, B, c, 3, 11); H1(c, d, e, A, B, 10, 13); H1(B, c, d, e, A, 14, 6); @@ -189,7 +189,7 @@ void rmd320_compress(rmd320_ctx *ctx, const void *sbuf) H1(A, B, c, d, e, 11, 12); H1(e, A, B, c, d, 5, 7); H1(d, e, A, B, c, 12, 5); - + H2(D, E, a, b, C, 15, 9); H2(C, D, E, a, b, 5, 7); H2(b, C, D, E, a, 1, 15); @@ -206,7 +206,7 @@ void rmd320_compress(rmd320_ctx *ctx, const void *sbuf) H2(a, b, C, D, E, 0, 13); H2(E, a, b, C, D, 4, 7); H2(D, E, a, b, C, 13, 5); - + I1(C, d, e, A, B, 1, 11); I1(B, C, d, e, A, 9, 12); I1(A, B, C, d, e, 11, 14); @@ -223,7 +223,7 @@ void rmd320_compress(rmd320_ctx *ctx, const void *sbuf) I1(e, A, B, C, d, 5, 6); I1(d, e, A, B, C, 6, 5); I1(C, d, e, A, B, 2, 12); - + I2(c, D, E, a, b, 8, 15); I2(b, c, D, E, a, 6, 5); I2(a, b, c, D, E, 4, 8); @@ -330,9 +330,9 @@ void rmd320_init(rmd320_ctx *ctx) void rmd320_set(rmd320_ctx *ctx, const void *buf, unsigned long count) { const octet *p = buf; - ctx->a = LOAD32_L(p + 0); - ctx->b = LOAD32_L(p + 4); - ctx->c = LOAD32_L(p + 8); + ctx->a = LOAD32_L(p + 0); + ctx->b = LOAD32_L(p + 4); + ctx->c = LOAD32_L(p + 8); ctx->d = LOAD32_L(p + 12); ctx->e = LOAD32_L(p + 16); ctx->A = LOAD32_L(p + 20); @@ -376,9 +376,9 @@ void rmd320_done(rmd320_ctx *ctx, void *hash) { octet *p = hash; HASH_MD5STRENGTH(RMD320, rmd320, ctx); - STORE32_L(p + 0, ctx->a); - STORE32_L(p + 4, ctx->b); - STORE32_L(p + 8, ctx->c); + STORE32_L(p + 0, ctx->a); + STORE32_L(p + 4, ctx->b); + STORE32_L(p + 8, ctx->c); STORE32_L(p + 12, ctx->d); STORE32_L(p + 16, ctx->e); STORE32_L(p + 20, ctx->A); @@ -402,9 +402,9 @@ void rmd320_done(rmd320_ctx *ctx, void *hash) unsigned long rmd320_state(rmd320_ctx *ctx, void *state) { octet *p = state; - STORE32_L(p + 0, ctx->a); - STORE32_L(p + 4, ctx->b); - STORE32_L(p + 8, ctx->c); + STORE32_L(p + 0, ctx->a); + STORE32_L(p + 4, ctx->b); + STORE32_L(p + 8, ctx->c); STORE32_L(p + 12, ctx->d); STORE32_L(p + 16, ctx->e); STORE32_L(p + 20, ctx->A);