Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7351:9971c2dc5080
* gc-gnulib.c [GC_USE_HMAC_SHA1]: include hmac.h for hmac_sha1.
* md4.c (md4_process_block): Remove unused variable.
* rijndael-api-fst.c (rijndaelBlockDecrypt): GCC suggests
parentheses for clarity.
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> |
|---|---|
| date | Fri, 22 Sep 2006 16:54:11 +0000 |
| parents | 6c5c8c8b93a3 |
| children | 3d5bd6899004 |
| files | lib/ChangeLog lib/gc-gnulib.c lib/md4.c lib/rijndael-api-fst.c |
| diffstat | 4 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2006-09-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + * gc-gnulib.c [GC_USE_HMAC_SHA1]: include hmac.h for hmac_sha1. + * md4.c (md4_process_block): Remove unused variable. + * rijndael-api-fst.c (rijndaelBlockDecrypt): GCC suggests + parentheses for clarity. + 2006-09-20 Paul Eggert <eggert@cs.ucla.edu> Import this patch from libc:
--- a/lib/gc-gnulib.c +++ b/lib/gc-gnulib.c @@ -52,7 +52,7 @@ #ifdef GC_USE_SHA1 # include "sha1.h" #endif -#ifdef GC_USE_HMAC_MD5 +#if defined(GC_USE_HMAC_MD5) || defined(GC_USE_HMAC_SHA1) # include "hmac.h" #endif
--- a/lib/md4.c +++ b/lib/md4.c @@ -311,7 +311,6 @@ the loop. */ while (words < endp) { - uint32_t tm; int t; for (t = 0; t < 16; t++) {
--- a/lib/rijndael-api-fst.c +++ b/lib/rijndael-api-fst.c @@ -1,5 +1,5 @@ /* rijndael-api-fst.c --- Rijndael cipher implementation. - * Copyright (C) 2005 Free Software Foundation, Inc. + * Copyright (C) 2005, 2006 Free Software Foundation, Inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published @@ -361,10 +361,10 @@ size_t i, k, t, numBlocks; char block[16], *iv; - if (cipher == NULL || - key == NULL || - cipher->mode != RIJNDAEL_MODE_CFB1 - && key->direction == RIJNDAEL_DIR_ENCRYPT) + if (cipher == NULL + || key == NULL + || (cipher->mode != RIJNDAEL_MODE_CFB1 + && key->direction == RIJNDAEL_DIR_ENCRYPT)) { return RIJNDAEL_BAD_CIPHER_STATE; }