[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS shishi/gl/m4
|
From: |
shishi-commit |
|
Subject: |
CVS shishi/gl/m4 |
|
Date: |
Sat, 22 Oct 2005 17:54:49 +0200 |
Update of /home/cvs/shishi/gl/m4
In directory dopio:/tmp/cvs-serv16026/gl/m4
Modified Files:
gc-hmac-sha1.m4 gc.m4 gnulib-cache.m4 gnulib-comp.m4
stdbool.m4
Added Files:
arcfour.m4 des.m4 gc-arcfour.m4 gc-des.m4 gc-hmac-md5.m4
gc-md4.m4 hmac-md5.m4 md4.m4 md5.m4
Log Message:
Update.
--- /home/cvs/shishi/gl/m4/gc-hmac-sha1.m4 2005/10/12 13:24:42 1.1
+++ /home/cvs/shishi/gl/m4/gc-hmac-sha1.m4 2005/10/22 15:54:49 1.2
@@ -8,7 +8,7 @@
[
AC_REQUIRE([gl_GC])
AC_DEFINE(GC_USE_HMAC_SHA1, 1,
- [Define to if you want to support HMAC-SHA1 through GC.])
+ [Define if you want to support HMAC-SHA1 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_SHA1
gl_HMAC_SHA1
--- /home/cvs/shishi/gl/m4/gc.m4 2005/10/12 13:24:42 1.1
+++ /home/cvs/shishi/gl/m4/gc.m4 2005/10/22 15:54:49 1.2
@@ -11,10 +11,9 @@
AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]),
libgcrypt=$withval, libgcrypt=no)
if test "$libgcrypt" != no; then
- AC_LIB_HAVE_LINKFLAGS([gcrypt])
+ AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [#include <gcrypt.h>])
fi
if test "$ac_cv_libgcrypt" = yes; then
- AC_CHECK_HEADER(gcrypt.h)
AC_LIBOBJ([gc-libgcrypt])
else
AC_LIBOBJ([gc-gnulib])
@@ -52,33 +51,30 @@
AC_ARG_ENABLE(random-device,
AC_HELP_STRING([--enable-random-device],
[device with (strong) randomness (for Nettle)]),
- NAME_OF_RANDOM_DEVICE=$enableval)
+ test "$enableval" != "no" && 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)
+ test "$enableval" != "no" && 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)
+ test "$enableval" != "no" && NAME_OF_NONCE_DEVICE=$enableval)
AC_MSG_RESULT($NAME_OF_NONCE_DEVICE)
if test "$cross_compiling" != yes; then
- AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,, AC_MSG_ERROR([[
- *** Device for (strong) random data $NAME_OF_RANDOM_DEVICE does not
exist
- ]]))
- AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,, AC_MSG_ERROR([[
- *** Device for pseudo-random data $NAME_OF_PSEUDO_RANDOM_DEVICE does
not exist
- ]]))
- AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,, AC_MSG_ERROR([[
- *** Device for unpredictable nonces $NAME_OF_NONCE_DEVICE does not
exist
- ]]))
+ AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,,
+ AC_MSG_ERROR([[device for (strong) random data
`$NAME_OF_RANDOM_DEVICE' does not exist]]))
+ AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,,
+ AC_MSG_ERROR([[device for pseudo-random data
`$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist]]))
+ AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,,
+ AC_MSG_ERROR([[device for unpredictable nonces `$NAME_OF_NONCE_DEVICE'
does not exist]]))
else
AC_MSG_NOTICE([[Cross compiling, assuming random devices exists...]])
fi
--- /home/cvs/shishi/gl/m4/gnulib-cache.m4 2005/10/12 13:24:42 1.3
+++ /home/cvs/shishi/gl/m4/gnulib-cache.m4 2005/10/22 15:54:49 1.4
@@ -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 error
gc-pbkdf2-sha1 getaddrinfo getdate gethostname getline getopt getpass getsubopt
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 error
gc-arcfour gc-des gc-hmac-md5 gc-hmac-sha1 gc-md4 gc-pbkdf2-sha1 getaddrinfo
getdate gethostname getline getopt getpass getsubopt 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 error gc-pbkdf2-sha1 getaddrinfo getdate gethostname
getline getopt getpass getsubopt progname realloc setenv socklen strcase
strchrnul strdup strndup strtok_r timegm vasnprintf vasprintf xalloc
xgetdomainname xgethostname xreadlink xstrndup xvasprintf])
+gl_MODULES([base64 error gc-arcfour gc-des gc-hmac-md5 gc-hmac-sha1 gc-md4
gc-pbkdf2-sha1 getaddrinfo getdate gethostname getline getopt getpass getsubopt
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/cvs/shishi/gl/m4/gnulib-comp.m4 2005/10/12 13:24:42 1.3
+++ /home/cvs/shishi/gl/m4/gnulib-comp.m4 2005/10/22 15:54:49 1.4
@@ -26,13 +26,18 @@
# "Check for header files, types and library functions".
AC_DEFUN([gl_INIT],
[
+AM_CONDITIONAL([GL_COND_LIBTOOL], [true])
gl_FUNC_ALLOCA
gl_ALLOCSA
gl_FUNC_BASE64
gl_ERROR
dnl gl_USE_SYSTEM_EXTENSIONS must be added quite early to configure.ac.
gl_GC
+ gl_GC_ARCFOUR
+ gl_GC_DES
+ gl_GC_HMAC_MD5
gl_GC_HMAC_SHA1
+ gl_GC_MD4
gl_GC_PBKDF2_SHA1
gl_GETADDRINFO
gl_GETDATE
@@ -84,10 +89,14 @@
lib/allocsa.c
lib/allocsa.h
lib/allocsa.valgrind
+ lib/arcfour.c
+ lib/arcfour.h
lib/asnprintf.c
lib/asprintf.c
lib/base64.c
lib/base64.h
+ lib/des.c
+ lib/des.h
lib/error.c
lib/error.h
lib/gai_strerror.c
@@ -117,11 +126,16 @@
lib/gettext.h
lib/gettime.c
lib/gettimeofday.c
+ lib/hmac-md5.c
lib/hmac-sha1.c
lib/hmac.h
lib/mbchar.c
lib/mbchar.h
lib/mbuiter.h
+ lib/md4.c
+ lib/md4.h
+ lib/md5.c
+ lib/md5.h
lib/memchr.c
lib/memxor.c
lib/memxor.h
@@ -182,14 +196,20 @@
lib/xvasprintf.h
m4/alloca.m4
m4/allocsa.m4
+ m4/arcfour.m4
m4/base64.m4
m4/bison.m4
m4/clock_time.m4
+ m4/des.m4
m4/eealloc.m4
m4/eoverflow.m4
m4/error.m4
m4/extensions.m4
+ m4/gc-arcfour.m4
+ m4/gc-des.m4
+ m4/gc-hmac-md5.m4
m4/gc-hmac-sha1.m4
+ m4/gc-md4.m4
m4/gc-pbkdf2-sha1.m4
m4/gc.m4
m4/getaddrinfo.m4
@@ -203,6 +223,7 @@
m4/getsubopt.m4
m4/gettime.m4
m4/gettimeofday.m4
+ m4/hmac-md5.m4
m4/hmac-sha1.m4
m4/intmax_t.m4
m4/inttypes.m4
@@ -215,6 +236,8 @@
m4/mbchar.m4
m4/mbiter.m4
m4/mbrtowc.m4
+ m4/md4.m4
+ m4/md5.m4
m4/memchr.m4
m4/memxor.m4
m4/mktime.m4
--- /home/cvs/shishi/gl/m4/stdbool.m4 2005/10/12 13:24:42 1.4
+++ /home/cvs/shishi/gl/m4/stdbool.m4 2005/10/22 15:54:49 1.5
@@ -28,6 +28,9 @@
AC_SUBST([HAVE__BOOL])
])
+# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
+AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
+
# This macro is only needed in autoconf <= 2.59. Newer versions of autoconf
# have this macro built-in.
@@ -73,7 +76,8 @@
char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
],
[
- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + !l
+ /* Refer to every declared value, to avoid compiler optimizations. */
+ return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+ !m + !n + !o + !p);
],
[ac_cv_header_stdbool_h=yes],
--- /home/cvs/shishi/gl/m4/arcfour.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/arcfour.m4 2005/10/22 15:54:49 1.1
# arcfour.m4 serial 1
dnl Copyright (C) 2005 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_ARCFOUR],
[
AC_LIBSOURCES([arcfour.c, arcfour.h])
AC_LIBOBJ([arcfour])
])
--- /home/cvs/shishi/gl/m4/des.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/des.m4 2005/10/22 15:54:49 1.1
# des.m4 serial 1
dnl Copyright (C) 2005 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_DES],
[
AC_LIBSOURCES([des.c, des.h])
AC_LIBOBJ([des])
])
--- /home/cvs/shishi/gl/m4/gc-arcfour.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/gc-arcfour.m4 2005/10/22 15:54:49 1.1
# gc-arcfour.m4 serial 1
dnl Copyright (C) 2005 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_ARCFOUR],
[
AC_REQUIRE([gl_GC])
AC_DEFINE(GC_USE_ARCFOUR, 1,
[Define if you want to support ARCFOUR through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_ARCFOUR
fi
])
--- /home/cvs/shishi/gl/m4/gc-des.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/gc-des.m4 2005/10/22 15:54:49 1.1
# gc-des.m4 serial 1
dnl Copyright (C) 2005 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_DES],
[
AC_REQUIRE([gl_GC])
AC_DEFINE(GC_USE_DES, 1, [Define if you want to support DES through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_DES
fi
])
--- /home/cvs/shishi/gl/m4/gc-hmac-md5.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/gc-hmac-md5.m4 2005/10/22 15:54:49 1.1
# gc-hmac-md5.m4 serial 1
dnl Copyright (C) 2005 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_HMAC_MD5],
[
AC_REQUIRE([gl_GC])
AC_DEFINE(GC_USE_HMAC_MD5, 1,
[Define if you want to support HMAC-MD5 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_MD5
gl_HMAC_MD5
gl_MEMXOR
fi
])
--- /home/cvs/shishi/gl/m4/gc-md4.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/gc-md4.m4 2005/10/22 15:54:49 1.1
# gc-md4.m4 serial 1
dnl Copyright (C) 2005 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_MD4],
[
AC_REQUIRE([gl_GC])
AC_DEFINE(GC_USE_MD4, 1, [Define if you want to support MD4 through GC.])
if test "$ac_cv_libgcrypt" != yes; then
gl_MD4
fi
])
--- /home/cvs/shishi/gl/m4/hmac-md5.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/hmac-md5.m4 2005/10/22 15:54:49 1.1
# hmac-md5.m4 serial 1
dnl Copyright (C) 2005 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_HMAC_MD5],
[
AC_LIBSOURCES([hmac.h, hmac-md5.c])
AC_LIBOBJ([hmac-md5])
])
--- /home/cvs/shishi/gl/m4/md4.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/md4.m4 2005/10/22 15:54:49 1.1
# md4.m4 serial 1
dnl Copyright (C) 2002, 2003, 2004, 2005 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_MD4],
[
AC_LIBSOURCES([md4.c, md4.h])
AC_LIBOBJ([md4])
dnl Prerequisites of lib/md4.c.
AC_REQUIRE([AC_C_BIGENDIAN])
])
--- /home/cvs/shishi/gl/m4/md5.m4 2005/10/22 15:54:49 NONE
+++ /home/cvs/shishi/gl/m4/md5.m4 2005/10/22 15:54:49 1.1
# md5.m4 serial 8
dnl Copyright (C) 2002, 2003, 2004, 2005 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_MD5],
[
AC_LIBSOURCES([md5.c, md5.h])
AC_LIBOBJ([md5])
dnl Prerequisites of lib/md5.c.
AC_REQUIRE([AC_C_BIGENDIAN])
:
])