summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Schulte <mo@g10code.com>2005-04-22 22:39:44 +0000
committerMoritz Schulte <mo@g10code.com>2005-04-22 22:39:44 +0000
commit32bf3f13e8b45497322177645bebf0b5d0c9cb8e (patch)
tree4bf14edee293122a3d50db262e7a6525a4d2fb67
parentbad07754a92175f84971267658220a5ab6a0d05b (diff)
downloadlibgcrypt-32bf3f13e8b45497322177645bebf0b5d0c9cb8e.tar.gz
ChangeLog:
2005-04-23 Moritz Schulte <moritz@g10code.com> * acinclude.m4 (TYPE_SOCKLEN_T): New type definition test; provided by Albert Chin. * configure.ac: Don't use $(CMD) as it's not portable; use `CMD` nstead. Simpler -lnsl/-lsocket test. Use TYPE_SOCKLEN_T test. Don't forget to set `random_modules' correctly. 2005-04-22 Moritz Schulte <moritz@g10code.com> * configure.ac: Added support for pkgconfig; provided by Albert Chin. cipher/ChangeLog: 2005-04-12 Moritz Schulte <moritz@g10code.com> * ac.c (_gcry_ac_io_write, _gcry_ac_io_read): Initialize err to make the compiler happy. Always use errno, now that gcry_malloc() is guaranteed to set errno on failure. (_gcry_ac_data_to_sexp): Don't forget to goto out after error in loop. (_gcry_ac_data_to_sexp): Remove unused variable: mpi_list; (_gcry_ac_data_to_sexp): Always deallocate sexp_buffer. (_gcry_ac_data_from_sexp): Don't forget to initialize data_set_new. (_gcry_ac_data_from_sexp): Handle special case, which is necessary, since gcry_sexp_nth() does not distinguish between "element does not exist" and "element is the empty list". (_gcry_ac_io_init_va): Use assert to make sure that mode and type are correct. Use gcry_error_t types where gcry_err_code_t types have been used before. mpi/ChangeLog: 2005-04-23 Moritz Schulte <moritz@g10code.com> * Makefile.am: Don't assume the compiler will pre-process the .S files. Some compilers, like those from HP and IBM, don't do this. So, we use the same solution gnupg-1.4.0 does. Preprocess first and then compile. * hppa1.1/mpih-mul3.S: Add "level 1.1" directive to disable warning about using PA-RISC1.1 opcodes. * hppa1.1/mpih-mul2.S: Likewise. * hppa1.1/mpih-mul1.S: Likewise. * hppa1.1/udiv-qrnnd.S: Likewise. src/ChangeLog: 2005-04-22 Moritz Schulte <moritz@g10code.com> * Makefile.am (pkgconfigdir, pkgconfig_DATA): New; support for pkgconfig provided by Albert Chin. * libgcrypt.pc.in (Cflags): New file. 2005-04-16 Moritz Schulte <moritz@g10code.com> * g10lib.h (_gcry_ac_init): Declare. * global.c (global_init): Call _gcry_ac_init; don't forget to set err. tests/ChangeLog: 2005-04-22 Moritz Schulte <moritz@g10code.com> * tsexp.c: Include <config.h> in case HAVE_CONFIG_H is defined; thanks to Albert Chin. * testapi.c: Likewise. * register.c: Likewise. * pubkey.c: Likewise. * prime.c: Likewise. * pkbench.c: Likewise. * keygen.c: Likewise. * benchmark.c: Likewise. * basic.c: Likewise. * ac-schemes.c: Likewise. * ac-data.c: Likewise. * ac.c: Likewise. 2005-04-16 Moritz Schulte <moritz@g10code.com> * ac-data.c (check_run): Include new test.
-rw-r--r--ChangeLog14
-rw-r--r--acinclude.m440
-rw-r--r--cipher/ChangeLog4
-rw-r--r--cipher/Makefile.am1
-rw-r--r--cipher/ac.c13
-rw-r--r--cipher/md.c3
-rw-r--r--configure.ac28
-rw-r--r--mpi/ChangeLog13
-rw-r--r--mpi/Makefile.am8
-rw-r--r--mpi/hppa1.1/mpih-mul1.S2
-rw-r--r--mpi/hppa1.1/mpih-mul2.S2
-rw-r--r--mpi/hppa1.1/mpih-mul3.S1
-rw-r--r--mpi/hppa1.1/udiv-qrnnd.S2
-rw-r--r--src/ChangeLog12
-rw-r--r--src/Makefile.am2
-rw-r--r--src/g10lib.h1
-rw-r--r--src/global.c10
-rw-r--r--src/libgcrypt.pc.in11
-rw-r--r--tests/ChangeLog20
-rw-r--r--tests/ac-data.c11
-rw-r--r--tests/ac-schemes.c3
-rw-r--r--tests/ac.c5
-rw-r--r--tests/basic.c5
-rw-r--r--tests/benchmark.c2
-rw-r--r--tests/keygen.c5
-rw-r--r--tests/pkbench.c5
-rw-r--r--tests/prime.c5
-rw-r--r--tests/pubkey.c5
-rw-r--r--tests/register.c5
-rw-r--r--tests/tsexp.c5
30 files changed, 202 insertions, 41 deletions
diff --git a/ChangeLog b/ChangeLog
index cf9d2857..5c79b495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-04-23 Moritz Schulte <moritz@g10code.com>
+
+ * acinclude.m4 (TYPE_SOCKLEN_T): New type definition test;
+ provided by Albert Chin.
+ * configure.ac: Don't use $(CMD) as it's not portable; use `CMD` nstead.
+ Simpler -lnsl/-lsocket test.
+ Use TYPE_SOCKLEN_T test.
+ Don't forget to set `random_modules' correctly.
+
+2005-04-22 Moritz Schulte <moritz@g10code.com>
+
+ * configure.ac: Added support for pkgconfig; provided by Albert
+ Chin.
+
2005-04-11 Moritz Schulte <moritz@g10code.com>
* configure.ac: Integrate Whirlpool.
diff --git a/acinclude.m4 b/acinclude.m4
index 8f13173d..91ae631f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -727,3 +727,43 @@ else
fi
])
+dnl Check for socklen_t: historically on BSD it is an int, and in
+dnl POSIX 1g it is a type of its own, but some platforms use different
+dnl types for the argument to getsockopt, getpeername, etc. So we
+dnl have to test to find something that will work.
+AC_DEFUN([TYPE_SOCKLEN_T],
+[
+ AC_CHECK_TYPE([socklen_t], ,[
+ AC_MSG_CHECKING([for socklen_t equivalent])
+ AC_CACHE_VAL([socklen_t_equiv],
+ [
+ # Systems have either "struct sockaddr *" or
+ # "void *" as the second argument to getpeername
+ socklen_t_equiv=
+ for arg2 in "struct sockaddr" void; do
+ for t in int size_t unsigned long "unsigned long"; do
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+ int getpeername (int, $arg2 *, $t *);
+ ],[
+ $t len;
+ getpeername(0,0,&len);
+ ],[
+ socklen_t_equiv="$t"
+ break
+ ])
+ done
+ done
+
+ if test "x$socklen_t_equiv" = x; then
+ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
+ fi
+ ])
+ AC_MSG_RESULT($socklen_t_equiv)
+ AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
+ [type to use in place of socklen_t if not defined])],
+ [#include <sys/types.h>
+#include <sys/socket.h>])
+])
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index fa9f61b7..0a536fe7 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-16 Moritz Schulte <moritz@g10code.com>
+
+ * ac.c (_gcry_ac_init): New function.
+
2005-04-12 Moritz Schulte <moritz@g10code.com>
* ac.c (_gcry_ac_io_write, _gcry_ac_io_read): Initialize err to
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index cf38060f..05d4e4d7 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -62,6 +62,7 @@ sha1.c \
sha256.c \
sha512.c \
tiger.c \
+whirlpool.c \
twofish.c \
rfc2268.c
diff --git a/cipher/ac.c b/cipher/ac.c
index c9b85c4d..1c7f4efb 100644
--- a/cipher/ac.c
+++ b/cipher/ac.c
@@ -1323,13 +1323,6 @@ ac_data_construct (const char *identifier, int include_flags,
-/*
- * Wrapper macros.
- */
-
-
-
-
/*
* Handle management.
*/
@@ -3475,3 +3468,9 @@ gcry_ac_name_to_id (const char *name, gcry_ac_id_t *algorithm)
return gcry_error (err);
}
+
+gcry_err_code_t
+_gcry_ac_init (void)
+{
+ return 0;
+}
diff --git a/cipher/md.c b/cipher/md.c
index 06b46e6e..95dad720 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -64,6 +64,9 @@ static struct digest_table_entry
#if USE_TIGER
{ &_gcry_digest_spec_tiger, GCRY_MD_TIGER },
#endif
+#if USE_WHIRLPOOL
+ { &_gcry_digest_spec_whirlpool, GCRY_MD_WHIRLPOOL },
+#endif
{ NULL },
};
diff --git a/configure.ac b/configure.ac
index 7a4f7170..79bc7638 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,7 +250,7 @@ default_digests="$available_digests"
AC_ARG_ENABLE(ciphers,
AC_HELP_STRING([--enable-ciphers=ciphers],
[select the symmetric ciphers to include]),
- [enabled_ciphers=$(echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]')],
+ [enabled_ciphers=`echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]'`],
[enabled_ciphers=""])
if test "x$enabled_ciphers" = "x" \
-o "$enabled_ciphers" = "yes" \
@@ -270,7 +270,7 @@ AC_MSG_RESULT([$enabled_ciphers])
AC_ARG_ENABLE(pubkey-ciphers,
AC_HELP_STRING([--enable-pubkey-ciphers=ciphers],
[select the public-key ciphers to include]),
- [enabled_pubkey_ciphers=$(echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]')],
+ [enabled_pubkey_ciphers=`echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]'`],
[enabled_pubkey_ciphers=""])
if test "x$enabled_pubkey_ciphers" = "x" \
-o "$enabled_pubkey_ciphers" = "yes" \
@@ -290,7 +290,7 @@ AC_MSG_RESULT([$enabled_pubkey_ciphers])
AC_ARG_ENABLE(digests,
AC_HELP_STRING([--enable-digests=digests],
[select the message digests to include]),
- [enabled_digests=$(echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]')],
+ [enabled_digests=`echo $enableval | tr , ' ' | tr '[A-Z]' '[a-z]'`],
[enabled_digests=""])
if test "x$enabled_digests" = "x" \
-o "$enabled_digests" = "yes" \
@@ -310,7 +310,7 @@ AC_MSG_RESULT([$enabled_digests])
AC_ARG_ENABLE(random,
AC_HELP_STRING([--enable-random=name],
[select which random number generator to use]),
- [random=$(echo $enableval | tr '[A-Z]' '[a-z]')],
+ [random=`echo $enableval | tr '[A-Z]' '[a-z]'`],
[])
if test "x$random" = "x" -o "$random" = "yes" -o "$random" = "no"; then
random=default
@@ -428,18 +428,9 @@ AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GCRYPT,
# Solaris needs -lsocket and -lnsl. Unisys system includes
# gethostbyname in libsocket but needs libnsl for socket.
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
-if test x$ac_need_libsocket = x1; then
- LIBS="$LIBS -lsocket"
-fi
-if test x$ac_try_nsl = x1; then
- AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
- if test x$ac_need_libnsl = x1
- then
- LIBS="$LIBS -lnsl"
- fi
-fi
+AC_SEARCH_LIBS(setsockopt, [socket], ,
+ [AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
+AC_SEARCH_LIBS(setsockopt, [nsl])
##################################
#### Checks for header files. ####
@@ -474,6 +465,8 @@ AC_CHECK_TYPE(socklen_t,,
#include <sys/socket.h>
])
+TYPE_SOCKLEN_T
+
#######################################
#### Checks for library functions. ####
#######################################
@@ -554,6 +547,8 @@ else
if test "$random" = "auto"; then
# Build everything, allow to select at runtime.
random_modules="$auto_random_modules"
+ else
+ random_modules="$random"
fi
fi
@@ -788,6 +783,7 @@ cipher/Makefile
doc/Makefile
src/Makefile
src/libgcrypt-config
+src/libgcrypt.pc
tests/Makefile
w32-dll/Makefile
])
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 5396e148..51478cd0 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,16 @@
+2005-04-23 Moritz Schulte <moritz@g10code.com>
+
+ * Makefile.am: Don't assume the compiler will pre-process the .S
+ files. Some compilers, like those from HP and IBM, don't do
+ this. So, we use the same solution gnupg-1.4.0 does. Preprocess
+ first and then compile.
+
+ * hppa1.1/mpih-mul3.S: Add "level 1.1" directive to disable
+ warning about using PA-RISC1.1 opcodes.
+ * hppa1.1/mpih-mul2.S: Likewise.
+ * hppa1.1/mpih-mul1.S: Likewise.
+ * hppa1.1/udiv-qrnnd.S: Likewise.
+
2005-02-16 Moritz Schulte <moritz@g10code.com>
* mpiutil.c (_gcry_mpi_alloc_limb_space): Rewritten, fixed memory
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 047d7936..e1098bb8 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -181,10 +181,14 @@ libmpi_la_DEPENDENCIES = @MPI_MOD_LIST_LO@
SUFFIXES = .S .o .obj .lo
.S.o:
- $(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+ $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > $*.s
+ $(CCASCOMPILE) -c `test -f '$*.s' || echo '$(srcdir)/'`$*.s
+ rm $*.s
.S.obj:
$(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.S.lo:
- $(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+ $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > $*.s
+ $(LTCCASCOMPILE) -c -o $@ `test -f '$*.s' || echo '$(srcdir)/'`$*.s
+ rm $*.s
diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S
index 93166e3c..45926dd7 100644
--- a/mpi/hppa1.1/mpih-mul1.S
+++ b/mpi/hppa1.1/mpih-mul1.S
@@ -55,6 +55,8 @@
* in the cache.)
*/
+ .level 1.1
+
.code
.export _gcry_mpih_mul_1
.label _gcry_mpih_mul_1
diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S
index 84b9d4ab..1047ab56 100644
--- a/mpi/hppa1.1/mpih-mul2.S
+++ b/mpi/hppa1.1/mpih-mul2.S
@@ -45,6 +45,8 @@
* There are some ideas described in mul1.S that applies to this code too.
*/
+ .level 1.1
+
.code
.export _gcry_mpih_addmul_1
.label _gcry_mpih_addmul_1
diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S
index c4246e47..632adf1e 100644
--- a/mpi/hppa1.1/mpih-mul3.S
+++ b/mpi/hppa1.1/mpih-mul3.S
@@ -51,6 +51,7 @@
* but that requires reworking the hairy software pipeline...
*/
+ .level 1.1
.code
.export _gcry_mpih_submul_1
diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S
index 020c31e3..3f28b7b6 100644
--- a/mpi/hppa1.1/udiv-qrnnd.S
+++ b/mpi/hppa1.1/udiv-qrnnd.S
@@ -36,6 +36,8 @@
* d gr23
*/
+ .level 1.1
+
.data
.align 8
.label L$0000
diff --git a/src/ChangeLog b/src/ChangeLog
index 1c555ed8..734fab28 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-22 Moritz Schulte <moritz@g10code.com>
+
+ * Makefile.am (pkgconfigdir, pkgconfig_DATA): New; support for
+ pkgconfig provided by Albert Chin.
+ * libgcrypt.pc.in (Cflags): New file.
+
+2005-04-16 Moritz Schulte <moritz@g10code.com>
+
+ * g10lib.h (_gcry_ac_init): Declare.
+ * global.c (global_init): Call _gcry_ac_init; don't forget to set
+ err.
+
2005-04-14 Werner Koch <wk@g10code.com>
* sexp.c (whitespacep): New.
diff --git a/src/Makefile.am b/src/Makefile.am
index 265f1368..0c7390d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,8 @@ EXTRA_DIST = Manifest libgcrypt-config.in libgcrypt.m4 libgcrypt.vers
bin_SCRIPTS = libgcrypt-config
m4datadir = $(datadir)/aclocal
m4data_DATA = libgcrypt.m4
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgcrypt.pc
include_HEADERS = gcrypt.h gcrypt-module.h
lib_LTLIBRARIES = libgcrypt.la
diff --git a/src/g10lib.h b/src/g10lib.h
index 5e395138..5bf3ff30 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -237,6 +237,7 @@ gcry_err_code_t _gcry_module_list (gcry_module_t modules,
gcry_err_code_t _gcry_cipher_init (void);
gcry_err_code_t _gcry_md_init (void);
gcry_err_code_t _gcry_pk_init (void);
+gcry_err_code_t _gcry_ac_init (void);
gcry_err_code_t _gcry_pk_module_lookup (int id, gcry_module_t *module);
void _gcry_pk_module_release (gcry_module_t module);
diff --git a/src/global.c b/src/global.c
index 35609238..513eec35 100644
--- a/src/global.c
+++ b/src/global.c
@@ -66,11 +66,15 @@ global_init (void)
err = ath_init ();
if (! err)
- _gcry_cipher_init ();
+ err = _gcry_cipher_init ();
if (! err)
- _gcry_md_init ();
+ err = _gcry_md_init ();
if (! err)
- _gcry_pk_init ();
+ err = _gcry_pk_init ();
+#if 0
+ if (! err)
+ err = _gcry_ac_init ();
+#endif
if (err)
/* FIXME? */
diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
new file mode 100644
index 00000000..6b6140d5
--- /dev/null
+++ b/src/libgcrypt.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: libgcrypt
+Description: General purpose crypto library
+Version: @VERSION@
+Requires: libgpg-error
+Libs: -L${libdir} -lgcrypt
+Cflags: -I${includedir}
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 4d7c1bea..f484854c 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,23 @@
+2005-04-22 Moritz Schulte <moritz@g10code.com>
+
+ * tsexp.c: Include <config.h> in case HAVE_CONFIG_H is defined;
+ thanks to Albert Chin.
+ * testapi.c: Likewise.
+ * register.c: Likewise.
+ * pubkey.c: Likewise.
+ * prime.c: Likewise.
+ * pkbench.c: Likewise.
+ * keygen.c: Likewise.
+ * benchmark.c: Likewise.
+ * basic.c: Likewise.
+ * ac-schemes.c: Likewise.
+ * ac-data.c: Likewise.
+ * ac.c: Likewise.
+
+2005-04-16 Moritz Schulte <moritz@g10code.com>
+
+ * ac-data.c (check_run): Include new test.
+
2005-04-11 Moritz Schulte <moritz@g10code.com>
* basic.c (check_digests): Add tests for Whirlpool.
diff --git a/tests/ac-data.c b/tests/ac-data.c
index fb752b33..b210b43e 100644
--- a/tests/ac-data.c
+++ b/tests/ac-data.c
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
@@ -72,9 +75,7 @@ check_sexp_conversion (gcry_ac_data_t data)
assert_err (err);
length1 = gcry_ac_data_length (data);
- assert (length1);
length2 = gcry_ac_data_length (data2);
- assert (length2);
assert (length1 == length2);
for (i = 0; i < length1; i++)
@@ -149,9 +150,11 @@ check_run (void)
gcry_mpi_release (mpi1);
printf ("data-set-test-1 succeeded\n");
-
-
+ gcry_ac_data_clear (data);
+ assert (! gcry_ac_data_length (data));
+ check_sexp_conversion (data);
+ printf ("data-set-test-2 succeeded\n");
gcry_ac_data_destroy (data);
diff --git a/tests/ac-schemes.c b/tests/ac-schemes.c
index 667f01b5..45ceece4 100644
--- a/tests/ac-schemes.c
+++ b/tests/ac-schemes.c
@@ -18,6 +18,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/ac.c b/tests/ac.c
index de37a2c2..75fe2dae 100644
--- a/tests/ac.c
+++ b/tests/ac.c
@@ -1,5 +1,5 @@
/* pubkey.c - Public key encryption/decryption tests
- * Copyright (C) 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/basic.c b/tests/basic.c
index 0737c882..d376e993 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -1,5 +1,5 @@
/* basic.c - basic regression tests
- * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/tests/benchmark.c b/tests/benchmark.c
index 8ca13b31..9516e828 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -1,5 +1,5 @@
/* benchmark.c - for libgcrypt
- * Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
diff --git a/tests/keygen.c b/tests/keygen.c
index 6cc8d4cb..6a4e015e 100644
--- a/tests/keygen.c
+++ b/tests/keygen.c
@@ -1,5 +1,5 @@
/* keygen.c - key generation regression tests
- * Copyright (C) 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2003, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/tests/pkbench.c b/tests/pkbench.c
index 3373fe32..d69bc5f3 100644
--- a/tests/pkbench.c
+++ b/tests/pkbench.c
@@ -1,5 +1,5 @@
/* pkbench.c - Pubkey menchmarking
- * Copyright (C) 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <gcrypt.h>
#include <assert.h>
diff --git a/tests/prime.c b/tests/prime.c
index 625c1537..12bcc894 100644
--- a/tests/prime.c
+++ b/tests/prime.c
@@ -1,5 +1,5 @@
/* prime.c - part of the Libgcrypt test suite.
- Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2005 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
@@ -16,6 +16,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <stdio.h>
#include <string.h>
diff --git a/tests/pubkey.c b/tests/pubkey.c
index 8753732b..e383f477 100644
--- a/tests/pubkey.c
+++ b/tests/pubkey.c
@@ -1,5 +1,5 @@
/* pubkey.c - Public key encryption/decryption tests
- * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/register.c b/tests/register.c
index a667c2d4..1181beb9 100644
--- a/tests/register.c
+++ b/tests/register.c
@@ -1,5 +1,5 @@
/* register.c - Test for registering of additional cipher modules.
- * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/tsexp.c b/tests/tsexp.c
index 195b84ae..3ec8a60e 100644
--- a/tests/tsexp.c
+++ b/tests/tsexp.c
@@ -1,5 +1,5 @@
/* tsexp.c - S-expression regression tests
- * Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
*
* This file is part of Libgcrypt.
*
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>