-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Simon Josefsson on 10/28/2006 2:57 PM:
>>
>> Do you want me to go ahead and update those as well?
>
> Yes, please do, I haven't really been tracking the config-h module and
> its consequences. If something breaks for me, I'll complain later...
With that, here's what I committed.
2006-10-29 Eric Blake <[EMAIL PROTECTED]>
* 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.
- --
Life is short - so eat dessert first!
Eric Blake [EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFRSKJ84KuGfSFAYARAumeAJ9zq8MPGu7oeiasMKwkhrl65fKQ+ACgo6A5
/qmwIdk0F2GOTJN67UoQY7o=
=fAF3
-----END PGP SIGNATURE-----
Index: lib/arcfour.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/arcfour.c,v
retrieving revision 1.2
diff -u -p -r1.2 arcfour.c
--- lib/arcfour.c 22 Oct 2005 16:45:58 -0000 1.2
+++ lib/arcfour.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "arcfour.h"
Index: lib/arctwo.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/arctwo.c,v
retrieving revision 1.2
diff -u -p -r1.2 arctwo.c
--- lib/arctwo.c 28 Oct 2005 10:58:45 -0000 1.2
+++ lib/arctwo.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "arctwo.h"
Index: lib/base64.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/base64.c,v
retrieving revision 1.13
diff -u -p -r1.13 base64.c
--- lib/base64.c 26 Jun 2006 21:30:04 -0000 1.13
+++ lib/base64.c 29 Oct 2006 21:49:55 -0000
@@ -41,9 +41,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Get prototype. */
#include "base64.h"
Index: lib/check-version.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/check-version.c,v
retrieving revision 1.5
diff -u -p -r1.5 check-version.c
--- lib/check-version.c 9 Jul 2006 10:18:17 -0000 1.5
+++ lib/check-version.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include <stddef.h>
#include <strverscmp.h>
Index: lib/crc.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/crc.c,v
retrieving revision 1.3
diff -u -p -r1.3 crc.c
--- lib/crc.c 11 May 2006 06:36:07 -0000 1.3
+++ lib/crc.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "crc.h"
Index: lib/des.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/des.c,v
retrieving revision 1.2
diff -u -p -r1.2 des.c
--- lib/des.c 10 May 2006 14:06:26 -0000 1.2
+++ lib/des.c 29 Oct 2006 21:49:55 -0000
@@ -94,9 +94,7 @@
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#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;
Index: lib/gc-gnulib.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/gc-gnulib.c,v
retrieving revision 1.19
diff -u -p -r1.19 gc-gnulib.c
--- lib/gc-gnulib.c 22 Sep 2006 16:54:11 -0000 1.19
+++ lib/gc-gnulib.c 29 Oct 2006 21:49:55 -0000
@@ -20,9 +20,7 @@
/* Note: This file is only built if GC uses internal functions. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Get prototype. */
#include "gc.h"
Index: lib/gc-libgcrypt.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/gc-libgcrypt.c,v
retrieving revision 1.15
diff -u -p -r1.15 gc-libgcrypt.c
--- lib/gc-libgcrypt.c 7 Mar 2006 13:17:10 -0000 1.15
+++ lib/gc-libgcrypt.c 29 Oct 2006 21:49:55 -0000
@@ -20,9 +20,7 @@
/* Note: This file is only built if GC uses Libgcrypt. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Get prototype. */
#include "gc.h"
Index: lib/gc-pbkdf2-sha1.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/gc-pbkdf2-sha1.c,v
retrieving revision 1.2
diff -u -p -r1.2 gc-pbkdf2-sha1.c
--- lib/gc-pbkdf2-sha1.c 13 Oct 2005 07:49:05 -0000 1.2
+++ lib/gc-pbkdf2-sha1.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "gc.h"
Index: lib/getaddrinfo.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/getaddrinfo.c,v
retrieving revision 1.18
diff -u -p -r1.18 getaddrinfo.c
--- lib/getaddrinfo.c 23 Oct 2006 22:31:11 -0000 1.18
+++ lib/getaddrinfo.c 29 Oct 2006 21:49:55 -0000
@@ -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 <[EMAIL PROTECTED]>.
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 <config.h>
-#endif
+#include <config.h>
#include "getaddrinfo.h"
Index: lib/getdelim.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/getdelim.c,v
retrieving revision 1.6
diff -u -p -r1.6 getdelim.c
--- lib/getdelim.c 5 Oct 2005 18:09:54 -0000 1.6
+++ lib/getdelim.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "getdelim.h"
Index: lib/getline.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/getline.c,v
retrieving revision 1.20
diff -u -p -r1.20 getline.c
--- lib/getline.c 19 Sep 2005 17:28:14 -0000 1.20
+++ lib/getline.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "getdelim.h"
#include "getline.h"
Index: lib/hmac-md5.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/hmac-md5.c,v
retrieving revision 1.3
diff -u -p -r1.3 hmac-md5.c
--- lib/hmac-md5.c 21 Oct 2005 12:49:28 -0000 1.3
+++ lib/hmac-md5.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "hmac.h"
Index: lib/hmac-sha1.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/hmac-sha1.c,v
retrieving revision 1.3
diff -u -p -r1.3 hmac-sha1.c
--- lib/hmac-sha1.c 21 Oct 2005 12:49:28 -0000 1.3
+++ lib/hmac-sha1.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "hmac.h"
Index: lib/iconvme.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/iconvme.c,v
retrieving revision 1.6
diff -u -p -r1.6 iconvme.c
--- lib/iconvme.c 3 Mar 2006 13:36:06 -0000 1.6
+++ lib/iconvme.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
/* Get prototype. */
#include "iconvme.h"
Index: lib/md2.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/md2.c,v
retrieving revision 1.1
diff -u -p -r1.1 md2.c
--- lib/md2.c 28 Oct 2005 12:09:34 -0000 1.1
+++ lib/md2.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "md2.h"
Index: lib/md4.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/md4.c,v
retrieving revision 1.7
diff -u -p -r1.7 md4.c
--- lib/md4.c 22 Sep 2006 16:54:11 -0000 1.7
+++ lib/md4.c 29 Oct 2006 21:49:55 -0000
@@ -20,9 +20,7 @@
/* Adapted by Simon Josefsson from gnulib md5.? and Libgcrypt
cipher/md4.c . */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "md4.h"
Index: lib/memxor.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/memxor.c,v
retrieving revision 1.3
diff -u -p -r1.3 memxor.c
--- lib/memxor.c 6 Oct 2005 11:19:54 -0000 1.3
+++ lib/memxor.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "memxor.h"
Index: lib/read-file.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/read-file.c,v
retrieving revision 1.2
diff -u -p -r1.2 read-file.c
--- lib/read-file.c 21 Jun 2006 08:02:40 -0000 1.2
+++ lib/read-file.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
#include "read-file.h"
Index: lib/readline.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/readline.c,v
retrieving revision 1.5
diff -u -p -r1.5 readline.c
--- lib/readline.c 1 Mar 2006 08:44:05 -0000 1.5
+++ lib/readline.c 29 Oct 2006 21:49:55 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
/* This module is intended to be used when the application only needs
the readline interface. If you need more functions from the
Index: lib/rijndael-alg-fst.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/rijndael-alg-fst.c,v
retrieving revision 1.1
diff -u -p -r1.1 rijndael-alg-fst.c
--- lib/rijndael-alg-fst.c 15 Oct 2005 18:21:59 -0000 1.1
+++ lib/rijndael-alg-fst.c 29 Oct 2006 21:49:56 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
/**
* rijndael-alg-fst.c
Index: lib/rijndael-api-fst.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/rijndael-api-fst.c,v
retrieving revision 1.3
diff -u -p -r1.3 rijndael-api-fst.c
--- lib/rijndael-api-fst.c 22 Sep 2006 16:54:11 -0000 1.3
+++ lib/rijndael-api-fst.c 29 Oct 2006 21:49:56 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
/**
* rijndael-api-fst.c
Index: lib/xgetdomainname.c
===================================================================
RCS file: /sources/gnulib/gnulib/lib/xgetdomainname.c,v
retrieving revision 1.4
diff -u -p -r1.4 xgetdomainname.c
--- lib/xgetdomainname.c 14 May 2005 06:03:58 -0000 1.4
+++ lib/xgetdomainname.c 29 Oct 2006 21:49:56 -0000
@@ -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 <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "xgetdomainname.h"
