X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmd2.c;h=62654f84a6c5b60aa68830c9ccbd154f6c1d4794;hb=0167c1923d0791e0e1491a856292b0945621c4e2;hp=e585eb808cdfe387e1814723c56eb66e1d7fb47c;hpb=c910e6ce03eefaf1b92911b3de50b2605d810d34;p=gnulib.git diff --git a/lib/md2.c b/lib/md2.c index e585eb808..62654f84a 100644 --- a/lib/md2.c +++ b/lib/md2.c @@ -1,7 +1,7 @@ /* Functions to compute MD2 message digest of files or memory blocks. according to the definition of MD2 in RFC 1319 from April 1992. - Copyright (C) 1995,1996,1997,1999,2000,2001,2002,2003,2005,2006,2008 - Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005, 2006, + 2008, 2009, 2010 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -115,33 +115,33 @@ md2_stream (FILE *stream, void *resblock) /* Read block. Take care for partial reads. */ while (1) - { - n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); - - sum += n; - - if (sum == BLOCKSIZE) - break; - - if (n == 0) - { - /* Check for the error flag IFF N == 0, so that we don't - exit the loop after a partial read due to e.g., EAGAIN - or EWOULDBLOCK. */ - if (ferror (stream)) - { - free (buffer); - return 1; - } - goto process_partial_block; - } - - /* We've read at least one byte, so ignore errors. But always - check for EOF, since feof may be true even though N > 0. - Otherwise, we could end up calling fread after EOF. */ - if (feof (stream)) - goto process_partial_block; - } + { + n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); + + sum += n; + + if (sum == BLOCKSIZE) + break; + + if (n == 0) + { + /* Check for the error flag IFF N == 0, so that we don't + exit the loop after a partial read due to e.g., EAGAIN + or EWOULDBLOCK. */ + if (ferror (stream)) + { + free (buffer); + return 1; + } + goto process_partial_block; + } + + /* We've read at least one byte, so ignore errors. But always + check for EOF, since feof may be true even though N > 0. + Otherwise, we could end up calling fread after EOF. */ + if (feof (stream)) + goto process_partial_block; + } /* Process buffer with BLOCKSIZE bytes. Note that BLOCKSIZE % 64 == 0 @@ -196,11 +196,11 @@ md2_process_bytes (const void *buffer, size_t len, struct md2_ctx *ctx) /* is 16 bytes full? */ if (ctx->curlen == 16) - { - md2_compress (ctx); - md2_update_chksum (ctx); - ctx->curlen = 0; - } + { + md2_compress (ctx); + md2_update_chksum (ctx); + ctx->curlen = 0; + } } } @@ -260,9 +260,9 @@ md2_compress (struct md2_ctx *ctx) for (j = 0; j < 18; j++) { for (k = 0; k < 48; k++) - { - t = (ctx->X[k] ^= PI_SUBST[(int) (t & 255)]); - } + { + t = (ctx->X[k] ^= PI_SUBST[(int) (t & 255)]); + } t = (t + (unsigned char) j) & 255; } }