From a42e0dae2fe2bc4d1166d572e8b5b447de9b9873 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sun, 29 Oct 2006 21:52:55 +0000 Subject: [PATCH] * lib/arcfour.c: Assume config.h. * lib/arctwo.c: Likewise. * lib/base64.c: Likewise. * lib/check-version.c: Likewise. * lib/crc.c: Likewise. * lib/des.c: Likewise. * lib/gc-gnulib.c: Likewise. * lib/gc-libgcrypt.c: Likewise. * lib/gc-pbkdf2-sha1.c: Likewise. * lib/getaddrinfo.c: Likewise. * lib/getdelim.c: Likewise. * lib/getline.c: Likewise. * lib/hmac-md5.c: Likewise. * lib/hmac-sha1.c: Likewise. * lib/iconvme.c: Likewise. * lib/md2.c: Likewise. * lib/md4.c: Likewise. * lib/memxor.c: Likewise. * lib/read-file.c: Likewise. * lib/readline.c: Likewise. * lib/rijndael-alg-fst.c: Likewise. * lib/rijndael-api-fst.c: Likewise. * lib/xgetdomainname.c: Likewise. --- ChangeLog | 26 ++++++++++++++++++++++++++ lib/arcfour.c | 7 +++---- lib/arctwo.c | 6 ++---- lib/base64.c | 4 +--- lib/check-version.c | 4 +--- lib/crc.c | 6 ++---- lib/des.c | 6 ++---- lib/gc-gnulib.c | 4 +--- lib/gc-libgcrypt.c | 4 +--- lib/gc-pbkdf2-sha1.c | 6 ++---- lib/getaddrinfo.c | 7 +++---- lib/getdelim.c | 6 ++---- lib/getline.c | 6 ++---- lib/hmac-md5.c | 6 ++---- lib/hmac-sha1.c | 6 ++---- lib/iconvme.c | 6 ++---- lib/md2.c | 6 ++---- lib/md4.c | 4 +--- lib/memxor.c | 6 ++---- lib/read-file.c | 4 +--- lib/readline.c | 4 +--- lib/rijndael-alg-fst.c | 6 ++---- lib/rijndael-api-fst.c | 4 +--- lib/xgetdomainname.c | 8 +++----- 24 files changed, 67 insertions(+), 85 deletions(-) diff --git a/ChangeLog b/ChangeLog index f88f1d4e7..a54c2f71b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2006-10-29 Eric Blake + + * lib/arcfour.c: Assume config.h. + * lib/arctwo.c: Likewise. + * lib/base64.c: Likewise. + * lib/check-version.c: Likewise. + * lib/crc.c: Likewise. + * lib/des.c: Likewise. + * lib/gc-gnulib.c: Likewise. + * lib/gc-libgcrypt.c: Likewise. + * lib/gc-pbkdf2-sha1.c: Likewise. + * lib/getaddrinfo.c: Likewise. + * lib/getdelim.c: Likewise. + * lib/getline.c: Likewise. + * lib/hmac-md5.c: Likewise. + * lib/hmac-sha1.c: Likewise. + * lib/iconvme.c: Likewise. + * lib/md2.c: Likewise. + * lib/md4.c: Likewise. + * lib/memxor.c: Likewise. + * lib/read-file.c: Likewise. + * lib/readline.c: Likewise. + * lib/rijndael-alg-fst.c: Likewise. + * lib/rijndael-api-fst.c: Likewise. + * lib/xgetdomainname.c: Likewise. + 2006-10-28 Eric Blake * lib/xstrndup.c: Assume config.h. diff --git a/lib/arcfour.c b/lib/arcfour.c index 97b61160e..95f8204f4 100644 --- a/lib/arcfour.c +++ b/lib/arcfour.c @@ -1,5 +1,6 @@ /* arcfour.c --- The arcfour stream cipher - * Copyright (C) 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2002, 2003, 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 @@ -26,9 +27,7 @@ * ISBN 0-471-11709-9. Pages 397 ff. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "arcfour.h" diff --git a/lib/arctwo.c b/lib/arctwo.c index 2c37471a1..ccaa4b6c2 100644 --- a/lib/arctwo.c +++ b/lib/arctwo.c @@ -1,5 +1,5 @@ /* arctwo.c --- The RC2 cipher as described in RFC 2268. - * Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + * Copyright (C) 2003, 2004, 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 @@ -27,9 +27,7 @@ * The implementation here is based on Peter Gutmann's RRC.2 paper. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "arctwo.h" diff --git a/lib/base64.c b/lib/base64.c index 3316d1c12..f237cd63b 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -41,9 +41,7 @@ * */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Get prototype. */ #include "base64.h" diff --git a/lib/check-version.c b/lib/check-version.c index 74cee20c8..c4074ae80 100644 --- a/lib/check-version.c +++ b/lib/check-version.c @@ -20,9 +20,7 @@ gcry_check_version from Werner Koch's Libgcrypt. Paul Eggert suggested the use of strverscmp to simplify implementation. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include #include diff --git a/lib/crc.c b/lib/crc.c index 6b7df8a78..fecfa71b5 100644 --- a/lib/crc.c +++ b/lib/crc.c @@ -1,5 +1,5 @@ /* crc.c -- cyclic redundancy checks - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 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 @@ -18,9 +18,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "crc.h" diff --git a/lib/des.c b/lib/des.c index 8dc74514e..3b171a7c1 100644 --- a/lib/des.c +++ b/lib/des.c @@ -94,9 +94,7 @@ */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "des.h" @@ -420,7 +418,7 @@ des_is_weak_key (const char * key) right = (data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7]; #define WRITE_64BIT_DATA(data, left, right) \ - data[0] = (left >> 24) &0xff; data[1] = (left >> 16) &0xff; \ + data[0] = (left >> 24) &0xff; data[1] = (left >> 16) &0xff; \ data[2] = (left >> 8) &0xff; data[3] = left &0xff; \ data[4] = (right >> 24) &0xff; data[5] = (right >> 16) &0xff; \ data[6] = (right >> 8) &0xff; data[7] = right &0xff; diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c index 2ca6cc833..adfa0ac23 100644 --- a/lib/gc-gnulib.c +++ b/lib/gc-gnulib.c @@ -20,9 +20,7 @@ /* Note: This file is only built if GC uses internal functions. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Get prototype. */ #include "gc.h" diff --git a/lib/gc-libgcrypt.c b/lib/gc-libgcrypt.c index a9e6279a2..25cafd68c 100644 --- a/lib/gc-libgcrypt.c +++ b/lib/gc-libgcrypt.c @@ -20,9 +20,7 @@ /* Note: This file is only built if GC uses Libgcrypt. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Get prototype. */ #include "gc.h" diff --git a/lib/gc-pbkdf2-sha1.c b/lib/gc-pbkdf2-sha1.c index 0c105aab9..3c864c6d6 100644 --- a/lib/gc-pbkdf2-sha1.c +++ b/lib/gc-pbkdf2-sha1.c @@ -1,5 +1,5 @@ /* gc-pbkdf2-sha1.c --- Password-Based Key Derivation Function a'la PKCS#5 - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 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 @@ -18,9 +18,7 @@ /* Written by Simon Josefsson. The comments in this file are taken from RFC 2898. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "gc.h" diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c index 333ad3b3d..358214afe 100644 --- a/lib/getaddrinfo.c +++ b/lib/getaddrinfo.c @@ -1,5 +1,6 @@ /* Get address information (partial implementation). - Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software + Foundation, Inc. Contributed by Simon Josefsson . This program is free software; you can redistribute it and/or modify @@ -16,9 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "getaddrinfo.h" diff --git a/lib/getdelim.c b/lib/getdelim.c index a131b0c63..e0b8a708b 100644 --- a/lib/getdelim.c +++ b/lib/getdelim.c @@ -1,5 +1,5 @@ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005 Free + Copyright (C) 1994, 1996, 1997, 1998, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or @@ -19,9 +19,7 @@ /* Ported from glibc by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "getdelim.h" diff --git a/lib/getline.c b/lib/getline.c index ab054fba6..c8c9244a0 100644 --- a/lib/getline.c +++ b/lib/getline.c @@ -1,5 +1,5 @@ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 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 @@ -18,9 +18,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "getdelim.h" #include "getline.h" diff --git a/lib/hmac-md5.c b/lib/hmac-md5.c index 816762b79..d4e807ef0 100644 --- a/lib/hmac-md5.c +++ b/lib/hmac-md5.c @@ -1,5 +1,5 @@ /* hmac-md5.c -- hashed message authentication codes - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 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 @@ -17,9 +17,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "hmac.h" diff --git a/lib/hmac-sha1.c b/lib/hmac-sha1.c index f7a3fda43..c84545b9d 100644 --- a/lib/hmac-sha1.c +++ b/lib/hmac-sha1.c @@ -1,5 +1,5 @@ /* hmac-sha1.c -- hashed message authentication codes - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 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 @@ -17,9 +17,7 @@ /* Written by Simon Josefsson. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "hmac.h" diff --git a/lib/iconvme.c b/lib/iconvme.c index 943380c03..555205ccd 100644 --- a/lib/iconvme.c +++ b/lib/iconvme.c @@ -1,5 +1,5 @@ /* Recode strings between character sets, using iconv. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 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 @@ -15,9 +15,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Get prototype. */ #include "iconvme.h" diff --git a/lib/md2.c b/lib/md2.c index 787b76693..c6154e4cf 100644 --- a/lib/md2.c +++ b/lib/md2.c @@ -1,6 +1,6 @@ /* 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 + Copyright (C) 1995,1996,1997,1999,2000,2001,2002,2003,2005,2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -20,9 +20,7 @@ /* Adapted by Simon Josefsson from public domain Libtomcrypt 1.06 by Tom St Denis. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "md2.h" diff --git a/lib/md4.c b/lib/md4.c index b70da3954..789cce0d0 100644 --- a/lib/md4.c +++ b/lib/md4.c @@ -20,9 +20,7 @@ /* Adapted by Simon Josefsson from gnulib md5.? and Libgcrypt cipher/md4.c . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "md4.h" diff --git a/lib/memxor.c b/lib/memxor.c index 46411d06c..9502d3983 100644 --- a/lib/memxor.c +++ b/lib/memxor.c @@ -1,5 +1,5 @@ /* memxor.c -- perform binary exclusive OR operation of two memory blocks. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005, 2006 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 @@ -18,9 +18,7 @@ /* Written by Simon Josefsson. The interface was inspired by memxor in Niels Möller's Nettle. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "memxor.h" diff --git a/lib/read-file.c b/lib/read-file.c index 4e2ebd560..1045b494c 100644 --- a/lib/read-file.c +++ b/lib/read-file.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include #include "read-file.h" diff --git a/lib/readline.c b/lib/readline.c index 52f002ed7..f93a11529 100644 --- a/lib/readline.c +++ b/lib/readline.c @@ -16,9 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* This module is intended to be used when the application only needs the readline interface. If you need more functions from the diff --git a/lib/rijndael-alg-fst.c b/lib/rijndael-alg-fst.c index 7f86c6c21..dcd812c44 100644 --- a/lib/rijndael-alg-fst.c +++ b/lib/rijndael-alg-fst.c @@ -1,5 +1,5 @@ /* rijndael-alg-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 @@ -25,9 +25,7 @@ * http://www.iaik.tu-graz.ac.at/research/krypto/AES/old/~rijmen/rijndael/rijndael-fst-3.0.zip */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /** * rijndael-alg-fst.c diff --git a/lib/rijndael-api-fst.c b/lib/rijndael-api-fst.c index e46047387..b55df797b 100644 --- a/lib/rijndael-api-fst.c +++ b/lib/rijndael-api-fst.c @@ -25,9 +25,7 @@ * http://www.iaik.tu-graz.ac.at/research/krypto/AES/old/~rijmen/rijndael/rijndael-fst-3.0.zip */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /** * rijndael-api-fst.c diff --git a/lib/xgetdomainname.c b/lib/xgetdomainname.c index 935923191..13dde76d2 100644 --- a/lib/xgetdomainname.c +++ b/lib/xgetdomainname.c @@ -1,6 +1,6 @@ /* xgetdomainname.c -- Return the NIS domain name, without size limitations. - Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004 Free Software Foundation, - Inc. + Copyright (C) 1992, 1996, 2000, 2001, 2003, 2004, 2006 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 @@ -18,9 +18,7 @@ /* Based on xgethostname.c, written by Jim Meyering. */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "xgetdomainname.h" -- 2.11.0