[svn] gcry - r1247 - in trunk: . mpi mpi/pentium4 src tests
svn author wk
cvs at cvs.gnupg.org
Thu May 3 22:33:11 CEST 2007
Author: wk
Date: 2007-05-03 22:32:42 +0200 (Thu, 03 May 2007)
New Revision: 1247
Modified:
trunk/ChangeLog
trunk/NEWS
trunk/autogen.sh
trunk/configure.ac
trunk/mpi/ChangeLog
trunk/mpi/pentium4/distfiles
trunk/src/ChangeLog
trunk/src/Makefile.am
trunk/src/libgcrypt.def
trunk/src/versioninfo.rc.in
trunk/tests/ChangeLog
trunk/tests/Makefile.am
Log:
Minor fixes for W32
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/ChangeLog 2007-05-03 20:32:42 UTC (rev 1247)
@@ -1,3 +1,7 @@
+2007-05-03 Werner Koch <wk at g10code.com>
+
+ * configure.ac: Fix detection of GPLed random modules.
+
2007-05-02 Werner Koch <wk at g10code.com>
* configure.ac (LIBGCRYPT_DIGESTS, LIBGCRYPT_CIPHERS)
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/NEWS 2007-05-03 20:32:42 UTC (rev 1247)
@@ -469,7 +469,7 @@
into into libgcrypt and GnuPG.
-Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright 2001, 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/autogen.sh 2007-05-03 20:32:42 UTC (rev 1247)
@@ -181,7 +181,7 @@
cat <<EOF
Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.CVS for details.
+the corresponding environment variables; see README.SVN for details.
EOF
exit 1
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/configure.ac 2007-05-03 20:32:42 UTC (rev 1247)
@@ -888,7 +888,8 @@
LIST_MEMBER(unix, $random_modules)
-test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo"
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndunix.lo" \
+ && gpl="$gpl rndunix"
AC_DEFINE_UNQUOTED(USE_RNDUNIX, $found,
[Defined if the default Unix RNG should be used.])
if test "$found" = "1"; then
@@ -901,7 +902,8 @@
[Defined if the EGD based RNG should be used.])
LIST_MEMBER(w32, $random_modules)
-test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndw32.lo"
+test "$found" = "1" && GCRYPT_RANDOM="$GCRYPT_RANDOM rndw32.lo" \
+ && gpl="$gpl rndw32"
AC_DEFINE_UNQUOTED(USE_RNDW32, $found,
[Defined if the Windows specific RNG should be used.])
@@ -982,9 +984,6 @@
G10EOF
fi
-for file in "random_modules"; do
- case "$file" in rndunix | rndw32) gpl="$gpl $file";; esac
-done
if test -n "$gpl"; then
echo "Please note that you are building a version of Libgcrypt with"
echo " $gpl"
Modified: trunk/mpi/ChangeLog
===================================================================
--- trunk/mpi/ChangeLog 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/mpi/ChangeLog 2007-05-03 20:32:42 UTC (rev 1247)
@@ -1,3 +1,7 @@
+2007-05-03 Werner Koch <wk at g10code.com>
+
+ * pentium4/distfiles: Fixed.
+
2007-04-30 Werner Koch <wk at g10code.com>
* config.links: Create a file mod-source-info.h.
Modified: trunk/mpi/pentium4/distfiles
===================================================================
--- trunk/mpi/pentium4/distfiles 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/mpi/pentium4/distfiles 2007-05-03 20:32:42 UTC (rev 1247)
@@ -1,12 +1,3 @@
README
-mmx:
-mpih-lshift.S
-mpih-rshift.S
-sse2:
-mpih-add1.S
-mpih-mul1.S
-mpih-mul2.S
-mpih-mul3.S
-mpih-sub1.S
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/src/ChangeLog 2007-05-03 20:32:42 UTC (rev 1247)
@@ -1,3 +1,8 @@
+2007-05-03 Werner Koch <wk at g10code.com>
+
+ * libgcrypt.def (gcry_sexp_nth_string): New.
+ * Makefile.am (EXTRA_DIST): Add libgcrypt.def.
+
2007-05-02 Werner Koch <wk at g10code.com>
* global.c (print_config): Print ciphers, digests and pubkeys.
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/src/Makefile.am 2007-05-03 20:32:42 UTC (rev 1247)
@@ -21,7 +21,7 @@
## Process this file with automake to produce Makefile.in
EXTRA_DIST = Manifest libgcrypt-config.in libgcrypt.m4 libgcrypt.vers \
- gcrypt.h.in
+ gcrypt.h.in libgcrypt.def
bin_SCRIPTS = libgcrypt-config
m4datadir = $(datadir)/aclocal
m4data_DATA = libgcrypt.m4
Modified: trunk/src/libgcrypt.def
===================================================================
--- trunk/src/libgcrypt.def 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/src/libgcrypt.def 2007-05-03 20:32:42 UTC (rev 1247)
@@ -224,3 +224,6 @@
gcry_ac_data_decrypt_scheme @184
gcry_ac_data_sign_scheme @185
gcry_ac_data_verify_scheme @186
+
+ gcry_sexp_nth_string @187
+
Modified: trunk/src/versioninfo.rc.in
===================================================================
--- trunk/src/versioninfo.rc.in 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/src/versioninfo.rc.in 2007-05-03 20:32:42 UTC (rev 1247)
@@ -34,7 +34,7 @@
BEGIN
BLOCK "040904b0"
BEGIN
- /* Note that the Windows versioin falls under the GPL. */
+ /* Note that the Windows version falls under the GPL. */
VALUE "Comments", "Provided under the terms of the GNU General Public License.\0"
VALUE "CompanyName", "g10 Code GmbH\0"
VALUE "FileDescription", "Libgcrypt - The GNU Crypto Library\0"
Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/tests/ChangeLog 2007-05-03 20:32:42 UTC (rev 1247)
@@ -1,3 +1,7 @@
+2007-05-03 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (EXTRA_DIST): Do not build pkbench.c
+
2007-05-02 David Shaw <dshaw at jabberwocky.com>
* basic.c (check_ciphers): Add Camellia.
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2007-05-02 17:18:57 UTC (rev 1246)
+++ trunk/tests/Makefile.am 2007-05-03 20:32:42 UTC (rev 1247)
@@ -21,7 +21,8 @@
TESTS = version t-mpi-bit prime register ac ac-schemes ac-data basic \
mpitests tsexp keygen pubkey hmac keygrip
-# random tests forking thus no a test for W32 does not make any sense.
+
+# random.c uses fork() thus a test for W32 does not make any sense.
if !HAVE_W32_SYSTEM
TESTS += random
endif
@@ -37,8 +38,9 @@
LDADD = ../src/libgcrypt.la
+EXTRA_PROGRAMS = testapi
+noinst_PROGRAMS = $(TESTS)
+
# pkbench uses mmap for no good reason. Needs to be fixed. Code for
# this can be found in libksba/tests.
-EXTRA_PROGRAMS = testapi
-noinst_PROGRAMS = $(TESTS) pkbench
-
+EXTRA_DIST = pkbench.c
More information about the Gnupg-commits
mailing list