CVS shishi/gl/m4

[shishi-commit]

Update of /home/jas/self/public-cvs/shishi/gl/m4
In directory latte:/home/jas/self/src/shishi/gl/m4

Modified Files:
        gnulib-cache.m4 gnulib-comp.m4 
Added Files:
        gc-random.m4 
Log Message:
Update.

--- /home/jas/self/public-cvs/shishi/gl/m4/gnulib-cache.m4      2006/02/14 
11:59:49     1.7
+++ /home/jas/self/public-cvs/shishi/gl/m4/gnulib-cache.m4      2006/03/13 
13:47:19     1.8
@@ -14,10 +14,10 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 
--aux-dir=. --avoid=xalloc-die --libtool --macro-prefix=gl base64 crc error 
gc-arcfour gc-des gc-hmac-md5 gc-hmac-sha1 gc-md4 gc-md5 gc-pbkdf2-sha1 
getaddrinfo getdate gethostname getline getopt getpass getsubopt 
maintainer-makefile progname realloc setenv socklen strcase strchrnul strdup 
strndup strtok_r timegm vasnprintf vasprintf xalloc xgetdomainname xgethostname 
xreadlink xstrndup xvasprintf
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 
--aux-dir=. --avoid=xalloc-die --libtool --macro-prefix=gl base64 crc error 
gc-arcfour gc-des gc-hmac-md5 gc-hmac-sha1 gc-md4 gc-md5 gc-pbkdf2-sha1 
gc-random getaddrinfo getdate gethostname getline getopt getpass getsubopt 
maintainer-makefile progname realloc setenv socklen strcase strchrnul strdup 
strndup strtok_r timegm vasnprintf vasprintf xalloc xgetdomainname xgethostname 
xreadlink xstrndup xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([base64 crc error gc-arcfour gc-des gc-hmac-md5 gc-hmac-sha1 gc-md4 
gc-md5 gc-pbkdf2-sha1 getaddrinfo getdate gethostname getline getopt getpass 
getsubopt maintainer-makefile progname realloc setenv socklen strcase strchrnul 
strdup strndup strtok_r timegm vasnprintf vasprintf xalloc xgetdomainname 
xgethostname xreadlink xstrndup xvasprintf])
+gl_MODULES([base64 crc error gc-arcfour gc-des gc-hmac-md5 gc-hmac-sha1 gc-md4 
gc-md5 gc-pbkdf2-sha1 gc-random getaddrinfo getdate gethostname getline getopt 
getpass getsubopt maintainer-makefile progname realloc setenv socklen strcase 
strchrnul strdup strndup strtok_r timegm vasnprintf vasprintf xalloc 
xgetdomainname xgethostname xreadlink xstrndup xvasprintf])
 gl_AVOID([xalloc-die])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
--- /home/jas/self/public-cvs/shishi/gl/m4/gnulib-comp.m4       2006/03/13 
13:42:16     1.12
+++ /home/jas/self/public-cvs/shishi/gl/m4/gnulib-comp.m4       2006/03/13 
13:47:19     1.13
@@ -42,6 +42,7 @@
   gl_GC_MD4
   gl_GC_MD5
   gl_GC_PBKDF2_SHA1
+  gl_GC_RANDOM
   gl_GETADDRINFO
   gl_GETDATE
   gl_FUNC_GETDELIM
@@ -223,6 +224,7 @@
   m4/gc-md4.m4
   m4/gc-md5.m4
   m4/gc-pbkdf2-sha1.m4
+  m4/gc-random.m4
   m4/gc.m4
   m4/getaddrinfo.m4
   m4/getdate.m4

--- /home/jas/self/public-cvs/shishi/gl/m4/gc-random.m4 2006/03/13 13:47:19     
NONE
+++ /home/jas/self/public-cvs/shishi/gl/m4/gc-random.m4 2006/03/13 13:47:19     
1.1
# gc-random.m4 serial 1
dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.

AC_DEFUN([gl_GC_RANDOM],
[
  # Devices with randomness.
  # FIXME: Are these the best defaults?

  AC_REQUIRE([AC_CANONICAL_HOST])dnl

  case "$host_os" in
    *openbsd*)
      NAME_OF_RANDOM_DEVICE="/dev/srandom"
      NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/prandom"
      NAME_OF_NONCE_DEVICE="/dev/urandom"
      ;;

    *netbsd*)
      NAME_OF_RANDOM_DEVICE="/dev/srandom"
      NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/urandom"
      NAME_OF_NONCE_DEVICE="/dev/urandom"
      ;;

    *solaris* | *irix* | *dec-osf* )
      NAME_OF_RANDOM_DEVICE="/dev/random"
      NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/random"
      NAME_OF_NONCE_DEVICE="/dev/random"
      ;;

    *)
      NAME_OF_RANDOM_DEVICE="/dev/random"
      NAME_OF_PSEUDO_RANDOM_DEVICE="/dev/urandom"
      NAME_OF_NONCE_DEVICE="/dev/urandom"
      ;;
  esac

  AC_MSG_CHECKING([device with (strong) random data...])
  AC_ARG_ENABLE(random-device,
        AC_HELP_STRING([--enable-random-device],
                [device with (strong) randomness (for Nettle)]),
        NAME_OF_RANDOM_DEVICE=$enableval)
  AC_MSG_RESULT($NAME_OF_RANDOM_DEVICE)

  AC_MSG_CHECKING([device with pseudo random data...])
  AC_ARG_ENABLE(pseudo-random-device,
        AC_HELP_STRING([--enable-pseudo-random-device],
                [device with pseudo randomness (for Nettle)]),
        NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval)
  AC_MSG_RESULT($NAME_OF_PSEUDO_RANDOM_DEVICE)

  AC_MSG_CHECKING([device with unpredictable data for nonces...])
  AC_ARG_ENABLE(nonce-device,
        AC_HELP_STRING([--enable-nonce-device],
                [device with unpredictable nonces (for Nettle)]),
        NAME_OF_NONCE_DEVICE=$enableval)
  AC_MSG_RESULT($NAME_OF_NONCE_DEVICE)

  if test "$cross_compiling" != yes; then
    if test "$NAME_OF_RANDOM_DEVICE" != "no"; then
      AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,,
        AC_MSG_WARN([[Device `$NAME_OF_RANDOM_DEVICE' does not exist, consider 
to use --enable-random-device]]))
    fi
    if test "$NAME_OF_PSEUDO_RANDOM_DEVICE" != "no"; then
      AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,,
        AC_MSG_WARN([[Device `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist, 
consider to use --enable-pseudo-random-device]]))
    fi
    if test "$NAME_OF_NONCE_DEVICE" != "no"; then
      AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,,
        AC_MSG_WARN([[Device `$NAME_OF_NONCE_DEVICE' does not exist, consider 
to use --enable-nonce-device]]))
    fi
  else
    AC_MSG_NOTICE([[Cross compiling, assuming random devices exists on the 
target host...]])  
  fi

  # FIXME?: Open+read 42 bytes+close twice and compare data.  Should differ.

  AC_DEFINE_UNQUOTED(NAME_OF_RANDOM_DEVICE, "$NAME_OF_RANDOM_DEVICE",
                   [defined to the name of the (strong) random device])
  AC_DEFINE_UNQUOTED(NAME_OF_PSEUDO_RANDOM_DEVICE,
                         "$NAME_OF_PSEUDO_RANDOM_DEVICE",
                   [defined to the name of the pseudo random device])
  AC_DEFINE_UNQUOTED(NAME_OF_NONCE_DEVICE, "$NAME_OF_NONCE_DEVICE",
                   [defined to the name of the unpredictable nonce device])

  AC_DEFINE(GC_USE_RANDOM, 1, [Define if you want to support RNG through GC.])
])