X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/5b69c389f8528045a8aabf848818dcbd1c420881..b2524d68efdcf16f3f7340da16094f17826c7b95:/sha256.c diff --git a/sha256.c b/sha256.c index 8ffc689..683ba13 100644 --- a/sha256.c +++ b/sha256.c @@ -1,13 +1,13 @@ /* -*-c-*- * - * $Id: sha256.c,v 1.2 2004/03/21 22:43:34 mdw Exp $ + * $Id: sha256.c,v 1.3 2004/04/08 01:36:15 mdw Exp $ * * Implementation of the SHA-256 hash function * * (c) 2000 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Catacomb. * @@ -15,29 +15,18 @@ * 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, * MA 02111-1307, USA. */ -/*----- Revision history --------------------------------------------------* - * - * $Log: sha256.c,v $ - * Revision 1.2 2004/03/21 22:43:34 mdw - * New hash variant SHA224. - * - * Revision 1.1 2000/10/15 17:48:14 mdw - * New SHA variants with longer outputs. - * - */ - /*----- Header files ------------------------------------------------------*/ #include @@ -104,7 +93,7 @@ void sha256_compress(sha256_ctx *ctx, const void *sbuf) } /* --- The main compression function --- */ - + T(a, b, c, d, e, f, g, h, 0, 0x428a2f98); T(h, a, b, c, d, e, f, g, 1, 0x71374491); T(g, h, a, b, c, d, e, f, 2, 0xb5c0fbcf); @@ -280,7 +269,7 @@ static void final(sha256_ctx *ctx) HASH_PAD(SHA256, sha256, ctx, 0x80, 0, 8); STORE32(ctx->buf + SHA256_BUFSZ - 8, (ctx->nl >> 29) | (ctx->nh << 3)); STORE32(ctx->buf + SHA256_BUFSZ - 4, ctx->nl << 3); - sha256_compress(ctx, ctx->buf); + sha256_compress(ctx, ctx->buf); } void sha256_done(sha256_ctx *ctx, void *hash)