* 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.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 046c22b..c5c616a 100644 (file)
--- 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:

diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c
index a91a7c3..2ca6cc8 100644 (file)
--- 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
 

diff --git a/lib/md4.c b/lib/md4.c
index 061d3e3..b70da39 100644 (file)
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -311,7 +311,6 @@ md4_process_block (const void *buffer, size_t len, struct md4_ctx *ctx)
      the loop.  */
   while (words < endp)
     {
-      uint32_t tm;
       int t;
       for (t = 0; t < 16; t++)
        {

diff --git a/lib/rijndael-api-fst.c b/lib/rijndael-api-fst.c
index 41f58a1..e460473 100644 (file)
--- 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 @@ rijndaelBlockDecrypt (rijndaelCipherInstance *cipher,
   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;
     }