Fixed symbol prefix detection.

Typo fixes.

10 files changed, 38 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index aab437c2..972f43f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
-2007-06-15  Marcus Brinkmann  <marcus@g10code.de>
+2007-07-26  Werner Koch  <wk@g10code.com>
 
-	* autogen.sh: Use = instead of == in test.
+	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Fix a syntax error
+	in the test program which lurked there for 4 years.  Adjusted name
+	of libtools global_system_pipe variable and add extra cut stage.
+	Reported by Gregor Riepl.
+	
+2007-06-15  Werner Koch  <wk@g10code.com>
+
+	* autogen.sh (FORCE): Use = and not == in test to be POSIXly correct.
 
 2007-05-30  Werner Koch  <wk@g10code.com>
 
diff --git a/NEWS b/NEWS
index 9b9a5e77..a6192b98 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,9 @@ Noteworthy changes in version 1.3.1
 
  * The Camellia cipher is now under the LGPL and included by default.
 
+ * Fixed a bug in the detection of symbol prefixes which inhibited the
+   build of optimzied assembler code on certain systems.
+
  * Interface changes relative to the 1.3.0 release:
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/THANKS b/THANKS
index fa37666a..ca82c5a6 100644
--- a/THANKS
+++ b/THANKS
@@ -34,6 +34,7 @@ Felix von Leitner	   leitner@amdiv.de
 Frank Heckenbach	   heckenb@mi.uni-erlangen.de
 Frank Stajano		   frank.stajano@cl.cam.ac.uk
 Gaël Quéri		   gqueri@mail.dotcom.fr
+Gregor Riepl               seto-kun@freesurf.ch
 Gerlinde Klaes             gk@u64.de
 Greg Louis		   glouis@dynamicro.on.ca
 Greg Troxel		   gdt@ir.bbn.com
diff --git a/TODO b/TODO
index 7f9e6012..3870dd0e 100644
--- a/TODO
+++ b/TODO
@@ -132,3 +132,6 @@ What's left to do                                 -*- outline -*-
 ** C++ tests
   We have some code to allow using libgcrypt from C++, so we also
   should have a test case.
+
+* /dev/urandom and Solaris
+  Make the configure check similar to GnuPG.
diff --git a/acinclude.m4 b/acinclude.m4
index dae5e223..a7bc0fa7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -93,12 +93,12 @@ if test "$tmp_do_check" = "yes"; then
   [ac_cv_sys_symbol_underscore=no
    cat > conftest.$ac_ext <<EOF
       void nm_test_func(){}
-      int main(){nm_test_func;return 0;
+      int main(){nm_test_func;return 0;}
 EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     ac_nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \| cut -d \' \' -f 2 \> $ac_nlist) && test -s "$ac_nlist"; then
       # See whether the symbols have a leading underscore.
       if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
         ac_cv_sys_symbol_underscore=yes
@@ -110,7 +110,7 @@ EOF
         fi
       fi
     else
-      echo "configure: cannot run $global_symbol_pipe" >&AC_FD_CC
+      echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
     fi
   else
     echo "configure: failed program was:" >&AC_FD_CC
diff --git a/autogen.sh b/autogen.sh
index e9e41e88..6bc47c4e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,7 +31,7 @@ check_version () {
 
 DIE=no
 FORCE=
-if test "$1" = "--force"; then
+if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi
@@ -75,11 +75,9 @@ if test "$1" = "--build-w32"; then
         fi
     fi
 
-    # Note: we include Camellia because this is anyway a GPLed build.
     ./configure --enable-maintainer-mode  --prefix=${w32root}  \
             --host=${host} --build=${build} \
-            --with-gpg-error-prefix=${w32root} \
-            --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
+            --with-gpg-error-prefix=${w32root}
     exit $?
 fi
 # ***** end W32 build script *******
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index 5e82e1eb..91fbfd4b 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -1214,7 +1214,7 @@ sexp_to_enc (gcry_sexp_t sexp, gcry_mpi_t **retarray, gcry_module_t *retalgo,
   return err;
 }
 
-/* Take the hash value and convert into an MPI, suitable for for
+/* Take the hash value and convert into an MPI, suitable for
    passing to the low level functions.  We currently support the
    old style way of passing just a MPI and the modern interface which
    allows to pass flags so that we can choose between raw and pkcs1
diff --git a/cipher/random.c b/cipher/random.c
index cffc9ab0..5c8aee98 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -163,7 +163,7 @@ static void (*fast_gather_fnc)(void (*)(const void*, size_t,
 
 /* Option flag useful for debugging and the test suite.  If set
    requests for very strong random are degraded to strong random.  Not
-   used by regualr applications.  */
+   used by regular applications.  */
 static int quick_test;
 
 /* On systems without entropy gathering modules, this flag is set to
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0742e465..ad3644e0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-15  Werner Koch  <wk@g10code.com>
+
+	* gcrypt.texi (Controlling the library): Clarified the use of
+	GCRYCTL_ENABLE_QUICK_RANDOM.
+
 2007-04-30  Werner Koch  <wk@g10code.com>
 
 	* HACKING: New.  Two items by Marcus.
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index 0bd37df3..4258dfd6 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -519,9 +519,16 @@ the memory guard is NOT used when the user of the library has set his
 own memory management callbacks.
 
 @item GCRYCTL_ENABLE_QUICK_RANDOM; Arguments: none
-This command activates the use of a highly-insecure, but fast PRNG.  It
-can only be used at initialization time.  The only useful applications
-for this are certain regression tests.
+This command inhibits the use the very secure random quality level
+(@code{GCRY_VERY_STRONG_RANDOM}) and degrades all request down to
+@code{GCRY_STRONG_RANDOM}.  In general this is not recommened.  However,
+for some applications the extra quality random Libgcrypt tries to create
+is not justified and this option may help to get better performace.
+Please check with a crypto expert whether this option can be used for
+your application.
+
+This option can only be used at initialization time.
+
 
 @item GCRYCTL_DUMP_RANDOM_STATS
 This command dumps PRNG related statistics to the librarys logging