libgcrypt (30 files)

cvs user mo cvs at cvs.gnupg.org
Sat Apr 23 00:23:08 CEST 2005


    Date: Saturday, April 23, 2005 @ 00:39:44
  Author: mo
    Path: /cvs/libgcrypt/libgcrypt

   Added: src/libgcrypt.pc.in
Modified: ChangeLog acinclude.m4 cipher/ChangeLog cipher/Makefile.am
          cipher/ac.c cipher/md.c configure.ac mpi/ChangeLog
          mpi/Makefile.am mpi/hppa1.1/mpih-mul1.S mpi/hppa1.1/mpih-mul2.S
          mpi/hppa1.1/mpih-mul3.S mpi/hppa1.1/udiv-qrnnd.S src/ChangeLog
          src/Makefile.am src/g10lib.h src/global.c tests/ChangeLog
          tests/ac-data.c tests/ac-schemes.c tests/ac.c tests/basic.c
          tests/benchmark.c tests/keygen.c tests/pkbench.c tests/prime.c
          tests/pubkey.c tests/register.c tests/tsexp.c

ChangeLog:

2005-04-23  Moritz Schulte  <moritz at 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 at g10code.com>

	* configure.ac: Added support for pkgconfig; provided by Albert
	Chin.

cipher/ChangeLog:


2005-04-12  Moritz Schulte  <moritz at 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 at 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 at 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 at 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 at 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 at g10code.com>

	* ac-data.c (check_run): Include new test.


--------------------------+
 ChangeLog                |   14 ++++++++++++++
 acinclude.m4             |   40 ++++++++++++++++++++++++++++++++++++++++
 cipher/ChangeLog         |    4 ++++
 cipher/Makefile.am       |    1 +
 cipher/ac.c              |   13 ++++++-------
 cipher/md.c              |    3 +++
 configure.ac             |   30 +++++++++++++-----------------
 mpi/ChangeLog            |   13 +++++++++++++
 mpi/Makefile.am          |    8 ++++++--
 mpi/hppa1.1/mpih-mul1.S  |    2 ++
 mpi/hppa1.1/mpih-mul2.S  |    2 ++
 mpi/hppa1.1/mpih-mul3.S  |    1 +
 mpi/hppa1.1/udiv-qrnnd.S |    2 ++
 src/ChangeLog            |   12 ++++++++++++
 src/Makefile.am          |    2 ++
 src/g10lib.h             |    1 +
 src/global.c             |   10 +++++++---
 src/libgcrypt.pc.in      |   11 +++++++++++
 tests/ChangeLog          |   20 ++++++++++++++++++++
 tests/ac-data.c          |   11 +++++++----
 tests/ac-schemes.c       |    3 +++
 tests/ac.c               |    5 ++++-
 tests/basic.c            |    5 ++++-
 tests/benchmark.c        |    2 +-
 tests/keygen.c           |    5 ++++-
 tests/pkbench.c          |    5 ++++-
 tests/prime.c            |    5 ++++-
 tests/pubkey.c           |    5 ++++-
 tests/register.c         |    5 ++++-
 tests/tsexp.c            |    5 ++++-
 30 files changed, 203 insertions(+), 42 deletions(-)


Index: libgcrypt/ChangeLog
diff -u libgcrypt/ChangeLog:1.166 libgcrypt/ChangeLog:1.167
--- libgcrypt/ChangeLog:1.166	Mon Apr 11 14:06:25 2005
+++ libgcrypt/ChangeLog	Sat Apr 23 00:39:42 2005
@@ -1,3 +1,17 @@
+2005-04-23  Moritz Schulte  <moritz at 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 at g10code.com>
+
+	* configure.ac: Added support for pkgconfig; provided by Albert
+	Chin.
+
 2005-04-11  Moritz Schulte  <moritz at g10code.com>
 
 	* configure.ac: Integrate Whirlpool.
Index: libgcrypt/acinclude.m4
diff -u libgcrypt/acinclude.m4:1.44 libgcrypt/acinclude.m4:1.45
--- libgcrypt/acinclude.m4:1.44	Tue Feb 22 18:54:27 2005
+++ libgcrypt/acinclude.m4	Sat Apr 23 00:39:42 2005
@@ -727,3 +727,43 @@
 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>])
+])
Index: libgcrypt/cipher/ChangeLog
diff -u libgcrypt/cipher/ChangeLog:1.231 libgcrypt/cipher/ChangeLog:1.232
--- libgcrypt/cipher/ChangeLog:1.231	Tue Apr 12 22:19:51 2005
+++ libgcrypt/cipher/ChangeLog	Sat Apr 23 00:39:42 2005
@@ -1,3 +1,7 @@
+2005-04-16  Moritz Schulte  <moritz at g10code.com>
+
+	* ac.c (_gcry_ac_init): New function.
+
 2005-04-12  Moritz Schulte  <moritz at g10code.com>
 
 	* ac.c (_gcry_ac_io_write, _gcry_ac_io_read): Initialize err to
Index: libgcrypt/cipher/Makefile.am
diff -u libgcrypt/cipher/Makefile.am:1.81 libgcrypt/cipher/Makefile.am:1.82
--- libgcrypt/cipher/Makefile.am:1.81	Fri Feb 13 13:44:13 2004
+++ libgcrypt/cipher/Makefile.am	Sat Apr 23 00:39:43 2005
@@ -62,6 +62,7 @@
 sha256.c \
 sha512.c \
 tiger.c \
+whirlpool.c \
 twofish.c \
 rfc2268.c
 
Index: libgcrypt/cipher/ac.c
diff -u libgcrypt/cipher/ac.c:1.18 libgcrypt/cipher/ac.c:1.19
--- libgcrypt/cipher/ac.c:1.18	Tue Apr 12 22:19:51 2005
+++ libgcrypt/cipher/ac.c	Sat Apr 23 00:39:43 2005
@@ -1323,13 +1323,6 @@
 
 
 
-/* 
- * Wrapper macros.
- */
-
-
-
-
 /*
  * Handle management.
  */
@@ -3475,3 +3468,9 @@
 
   return gcry_error (err);
 }
+
+gcry_err_code_t
+_gcry_ac_init (void)
+{
+  return 0;
+}
Index: libgcrypt/cipher/md.c
diff -u libgcrypt/cipher/md.c:1.84 libgcrypt/cipher/md.c:1.85
--- libgcrypt/cipher/md.c:1.84	Sun Apr 10 21:00:27 2005
+++ libgcrypt/cipher/md.c	Sat Apr 23 00:39:43 2005
@@ -64,6 +64,9 @@
 #if USE_TIGER
     { &_gcry_digest_spec_tiger, GCRY_MD_TIGER },
 #endif
+#if USE_WHIRLPOOL
+    { &_gcry_digest_spec_whirlpool, GCRY_MD_WHIRLPOOL },
+#endif
     { NULL },
   };
 
Index: libgcrypt/configure.ac
diff -u libgcrypt/configure.ac:1.74 libgcrypt/configure.ac:1.75
--- libgcrypt/configure.ac:1.74	Mon Apr 11 14:06:25 2005
+++ libgcrypt/configure.ac	Sat Apr 23 00:39:42 2005
@@ -19,7 +19,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # (Process this file with autoconf to produce a configure script.)
-AC_REVISION($Revision: 1.74 $)
+AC_REVISION($Revision: 1.75 $)
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
 
@@ -250,7 +250,7 @@
 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_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_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_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 @@
 
 # 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 @@
 #include <sys/socket.h>
               ])
 
+TYPE_SOCKLEN_T
+
 #######################################
 #### Checks for library functions. ####
 #######################################
@@ -554,6 +547,8 @@
     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 @@
 doc/Makefile
 src/Makefile
 src/libgcrypt-config
+src/libgcrypt.pc
 tests/Makefile
 w32-dll/Makefile
 ])
Index: libgcrypt/mpi/ChangeLog
diff -u libgcrypt/mpi/ChangeLog:1.92 libgcrypt/mpi/ChangeLog:1.93
--- libgcrypt/mpi/ChangeLog:1.92	Tue Feb 22 18:54:27 2005
+++ libgcrypt/mpi/ChangeLog	Sat Apr 23 00:39:43 2005
@@ -1,3 +1,16 @@
+2005-04-23  Moritz Schulte  <moritz at 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 at g10code.com>
 
 	* mpiutil.c (_gcry_mpi_alloc_limb_space): Rewritten, fixed memory
Index: libgcrypt/mpi/Makefile.am
diff -u libgcrypt/mpi/Makefile.am:1.37 libgcrypt/mpi/Makefile.am:1.38
--- libgcrypt/mpi/Makefile.am:1.37	Fri Dec 19 12:44:32 2003
+++ libgcrypt/mpi/Makefile.am	Sat Apr 23 00:39:43 2005
@@ -181,10 +181,14 @@
 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
Index: libgcrypt/mpi/hppa1.1/mpih-mul1.S
diff -u libgcrypt/mpi/hppa1.1/mpih-mul1.S:1.5 libgcrypt/mpi/hppa1.1/mpih-mul1.S:1.6
--- libgcrypt/mpi/hppa1.1/mpih-mul1.S:1.5	Tue May 14 15:11:07 2002
+++ libgcrypt/mpi/hppa1.1/mpih-mul1.S	Sat Apr 23 00:39:43 2005
@@ -55,6 +55,8 @@
  * in the cache.)
  */
 
+	.level		1.1
+
 	.code
 	.export 	_gcry_mpih_mul_1
 	.label		_gcry_mpih_mul_1
Index: libgcrypt/mpi/hppa1.1/mpih-mul2.S
diff -u libgcrypt/mpi/hppa1.1/mpih-mul2.S:1.5 libgcrypt/mpi/hppa1.1/mpih-mul2.S:1.6
--- libgcrypt/mpi/hppa1.1/mpih-mul2.S:1.5	Tue May 14 15:11:07 2002
+++ libgcrypt/mpi/hppa1.1/mpih-mul2.S	Sat Apr 23 00:39:43 2005
@@ -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
Index: libgcrypt/mpi/hppa1.1/mpih-mul3.S
diff -u libgcrypt/mpi/hppa1.1/mpih-mul3.S:1.5 libgcrypt/mpi/hppa1.1/mpih-mul3.S:1.6
--- libgcrypt/mpi/hppa1.1/mpih-mul3.S:1.5	Tue May 14 15:11:07 2002
+++ libgcrypt/mpi/hppa1.1/mpih-mul3.S	Sat Apr 23 00:39:43 2005
@@ -51,6 +51,7 @@
  * but that requires reworking the hairy software pipeline...
  */
 
+	.level		1.1
 
 	.code
 	.export 	_gcry_mpih_submul_1
Index: libgcrypt/mpi/hppa1.1/udiv-qrnnd.S
diff -u libgcrypt/mpi/hppa1.1/udiv-qrnnd.S:1.8 libgcrypt/mpi/hppa1.1/udiv-qrnnd.S:1.9
--- libgcrypt/mpi/hppa1.1/udiv-qrnnd.S:1.8	Tue Feb 22 18:54:26 2005
+++ libgcrypt/mpi/hppa1.1/udiv-qrnnd.S	Sat Apr 23 00:39:43 2005
@@ -36,6 +36,8 @@
  *   d		   gr23
  */
 
+	.level		1.1
+
         .data
 	.align		8
 	.label L$0000
Index: libgcrypt/src/ChangeLog
diff -u libgcrypt/src/ChangeLog:1.164 libgcrypt/src/ChangeLog:1.165
--- libgcrypt/src/ChangeLog:1.164	Thu Apr 14 19:50:16 2005
+++ libgcrypt/src/ChangeLog	Sat Apr 23 00:39:43 2005
@@ -1,3 +1,15 @@
+2005-04-22  Moritz Schulte  <moritz at 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 at 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 at g10code.com>
 
 	* sexp.c (whitespacep): New.
Index: libgcrypt/src/Makefile.am
diff -u libgcrypt/src/Makefile.am:1.44 libgcrypt/src/Makefile.am:1.45
--- libgcrypt/src/Makefile.am:1.44	Thu Apr 15 11:12:34 2004
+++ libgcrypt/src/Makefile.am	Sat Apr 23 00:39:44 2005
@@ -22,6 +22,8 @@
 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
Index: libgcrypt/src/g10lib.h
diff -u libgcrypt/src/g10lib.h:1.27 libgcrypt/src/g10lib.h:1.28
--- libgcrypt/src/g10lib.h:1.27	Sun Feb 13 19:13:22 2005
+++ libgcrypt/src/g10lib.h	Sat Apr 23 00:39:44 2005
@@ -237,6 +237,7 @@
 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);
Index: libgcrypt/src/global.c
diff -u libgcrypt/src/global.c:1.48 libgcrypt/src/global.c:1.49
--- libgcrypt/src/global.c:1.48	Tue Feb 22 18:49:27 2005
+++ libgcrypt/src/global.c	Sat Apr 23 00:39:44 2005
@@ -66,11 +66,15 @@
 
   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?  */
Index: libgcrypt/src/libgcrypt.pc.in
diff -u /dev/null libgcrypt/src/libgcrypt.pc.in:1.1
--- /dev/null	Sat Apr 23 00:39:59 2005
+++ libgcrypt/src/libgcrypt.pc.in	Sat Apr 23 00:39:44 2005
@@ -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}
Index: libgcrypt/tests/ChangeLog
diff -u libgcrypt/tests/ChangeLog:1.55 libgcrypt/tests/ChangeLog:1.56
--- libgcrypt/tests/ChangeLog:1.55	Mon Apr 11 14:02:35 2005
+++ libgcrypt/tests/ChangeLog	Sat Apr 23 00:39:44 2005
@@ -1,3 +1,23 @@
+2005-04-22  Moritz Schulte  <moritz at 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 at g10code.com>
+
+	* ac-data.c (check_run): Include new test.
+
 2005-04-11  Moritz Schulte  <moritz at g10code.com>
 
 	* basic.c (check_digests): Add tests for Whirlpool.
Index: libgcrypt/tests/ac-data.c
diff -u libgcrypt/tests/ac-data.c:1.1 libgcrypt/tests/ac-data.c:1.2
--- libgcrypt/tests/ac-data.c:1.1	Wed Mar 30 21:05:25 2005
+++ libgcrypt/tests/ac-data.c	Sat Apr 23 00:39:44 2005
@@ -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 @@
   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 @@
   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);
  
Index: libgcrypt/tests/ac-schemes.c
diff -u libgcrypt/tests/ac-schemes.c:1.2 libgcrypt/tests/ac-schemes.c:1.3
--- libgcrypt/tests/ac-schemes.c:1.2	Wed Mar 30 21:05:25 2005
+++ libgcrypt/tests/ac-schemes.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/ac.c
diff -u libgcrypt/tests/ac.c:1.8 libgcrypt/tests/ac.c:1.9
--- libgcrypt/tests/ac.c:1.8	Thu Jan 15 08:41:28 2004
+++ libgcrypt/tests/ac.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/basic.c
diff -u libgcrypt/tests/basic.c:1.28 libgcrypt/tests/basic.c:1.29
--- libgcrypt/tests/basic.c:1.28	Mon Apr 11 14:02:35 2005
+++ libgcrypt/tests/basic.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/benchmark.c
diff -u libgcrypt/tests/benchmark.c:1.3 libgcrypt/tests/benchmark.c:1.4
--- libgcrypt/tests/benchmark.c:1.3	Wed Mar  3 09:08:05 2004
+++ libgcrypt/tests/benchmark.c	Sat Apr 23 00:39:44 2005
@@ -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.
  *
Index: libgcrypt/tests/keygen.c
diff -u libgcrypt/tests/keygen.c:1.6 libgcrypt/tests/keygen.c:1.7
--- libgcrypt/tests/keygen.c:1.6	Tue Nov  4 13:03:40 2003
+++ libgcrypt/tests/keygen.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/pkbench.c
diff -u libgcrypt/tests/pkbench.c:1.3 libgcrypt/tests/pkbench.c:1.4
--- libgcrypt/tests/pkbench.c:1.3	Wed Sep 15 22:36:10 2004
+++ libgcrypt/tests/pkbench.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/prime.c
diff -u libgcrypt/tests/prime.c:1.2 libgcrypt/tests/prime.c:1.3
--- libgcrypt/tests/prime.c:1.2	Fri Oct 10 16:17:20 2003
+++ libgcrypt/tests/prime.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/pubkey.c
diff -u libgcrypt/tests/pubkey.c:1.5 libgcrypt/tests/pubkey.c:1.6
--- libgcrypt/tests/pubkey.c:1.5	Thu Dec  4 17:11:53 2003
+++ libgcrypt/tests/pubkey.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/register.c
diff -u libgcrypt/tests/register.c:1.6 libgcrypt/tests/register.c:1.7
--- libgcrypt/tests/register.c:1.6	Tue Jul 22 00:51:40 2003
+++ libgcrypt/tests/register.c	Sat Apr 23 00:39:44 2005
@@ -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>
Index: libgcrypt/tests/tsexp.c
diff -u libgcrypt/tests/tsexp.c:1.10 libgcrypt/tests/tsexp.c:1.11
--- libgcrypt/tests/tsexp.c:1.10	Tue Feb  3 13:13:15 2004
+++ libgcrypt/tests/tsexp.c	Sat Apr 23 00:39:44 2005
@@ -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>




More information about the Gnupg-commits mailing list