From 8b50a885edd427a591bbe9a422c1e553584f5e01 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Fri, 22 Sep 2006 16:54:11 +0000 Subject: [PATCH] * 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. --- lib/ChangeLog | 7 +++++++ lib/gc-gnulib.c | 2 +- lib/md4.c | 1 - lib/rijndael-api-fst.c | 10 +++++----- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 046c22b71..c5c616adc 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2006-09-22 Ralf Wildenhues + + * 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 Import this patch from libc: diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c index a91a7c39a..2ca6cc833 100644 --- 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 061d3e3d5..b70da3954 100644 --- 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 41f58a163..e46047387 100644 --- 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; } -- 2.11.0