# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-rijndael gc-sha1 getline getpass gettext inet_ntop maintainer-makefile memmem memmove minmax readline snprintf socklen stdint
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 getline getpass gettext inet_ntop maintainer-makefile memmem memmove minmax readline snprintf socklen stdint
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
-/* gc-gl-common.c --- Common gnulib internal crypto interface functions
- * Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson
+/* gc-gnulib.c --- Common gnulib internal crypto interface functions
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
#include <string.h>
/* For randomize. */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
+#ifdef GC_USE_RANDOM
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <fcntl.h>
+# include <errno.h>
+#endif
/* Hashes. */
#ifdef GC_USE_MD2
return;
}
+#ifdef GC_USE_RANDOM
+
/* Randomness. */
static Gc_rc
break;
}
+ if (strcmp (device, "no") == 0)
+ return GC_RANDOM_ERROR;
+
fd = open (device, O_RDONLY);
if (fd < 0)
return GC_RANDOM_ERROR;
return randomize (2, data, datalen);
}
+#endif
+
/* Memory allocation. */
void
/* gc-libgcrypt.c --- Crypto wrappers around Libgcrypt for GC.
- * Copyright (C) 2002, 2003, 2004, 2005 Simon Josefsson
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006 Simon Josefsson
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
return;
}
+#ifdef GC_USE_RANDOM
+
/* Randomness. */
Gc_rc
return GC_OK;
}
+#endif
+
/* Memory allocation. */
void
--- /dev/null
+# 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)]),
+ 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)]),
+ 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)]),
+ 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_WARN([[device for (strong) random data `$NAME_OF_RANDOM_DEVICE' does not exist]]))
+ AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,,
+ AC_MSG_WARN([[device for pseudo-random data `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist]]))
+ AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,,
+ AC_MSG_WARN([[device for unpredictable nonces `$NAME_OF_NONCE_DEVICE' does not exist]]))
+ 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.])
+])
-# gc.m4 serial 1
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# gc.m4 serial 2
+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_LIBOBJ([gc-libgcrypt])
else
AC_LIBOBJ([gc-gnulib])
-
- # Devices with randomness.
- # FIXME: Are these the best defaults?
-
- case "${target}" 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)]),
- 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)]),
- 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)]),
- 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]]))
- else
- AC_MSG_NOTICE([[Cross compiling, assuming random devices exists...]])
- 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])
fi
])
# Specification in the form of a command-line invocation:
-# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-rijndael gc-sha1 getline getpass gettext inet_ntop maintainer-makefile memmem memmove minmax readline snprintf socklen stdint
+# gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 getline getpass gettext inet_ntop maintainer-makefile memmem memmove minmax readline snprintf socklen stdint
# Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-rijndael gc-sha1 getline getpass gettext inet_ntop maintainer-makefile memmem memmove minmax readline snprintf socklen stdint])
+gl_MODULES([gc gc-arcfour gc-arctwo gc-des gc-hmac-md5 gc-md2 gc-md4 gc-md5 gc-pbkdf2-sha1 gc-random gc-rijndael gc-sha1 getline getpass gettext inet_ntop maintainer-makefile memmem memmove minmax readline snprintf socklen stdint])
gl_AVOID([])
gl_SOURCE_BASE([gl])
gl_M4_BASE([gl/m4])
gl_GC_MD4
gl_GC_MD5
gl_GC_PBKDF2_SHA1
+ gl_GC_RANDOM
gl_GC_RIJNDAEL
gl_GC_SHA1
gl_FUNC_GETDELIM
m4/gc-md4.m4
m4/gc-md5.m4
m4/gc-pbkdf2-sha1.m4
+ m4/gc-random.m4
m4/gc-rijndael.m4
m4/gc-sha1.m4
m4/gc.m4
-# readline.m4 serial 3
-dnl Copyright (C) 2005 Free Software Foundation, Inc.
+# readline.m4 serial 4
+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_TRY_LINK([#include <stdio.h>
#include <readline/readline.h>],
[readline((char*)0);],
- gl_cv_lib_readline=yes)
- if test "$gl_cv_lib_readline" = yes; then
- if test -n "$extra_lib"; then
- LIBREADLINE="$LIBREADLINE -l$extra_lib"
- LTLIBREADLINE="$LTLIBREADLINE -l$extra_lib"
- fi
- break
+ [gl_cv_lib_readline=" -l$extra_lib"])
+ if test "$gl_cv_lib_readline" != no; then
+ break
fi
done
LIBS="$am_save_LIBS"
])
- if test "$gl_cv_lib_readline" = yes; then
+ if test "$gl_cv_lib_readline" != no; then
AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.])
- fi
-
- if test "$gl_cv_lib_readline" = yes; then
+ if test "$gl_cv_lib_readline" != " -l"; then
+ LIBREADLINE="$LIBREADLINE$gl_cv_lib_readline"
+ LTLIBREADLINE="$LTLIBREADLINE$gl_cv_lib_readline"
+ fi
AC_MSG_CHECKING([how to link with libreadline])
AC_MSG_RESULT([$LIBREADLINE])
else
POURL = http://www.iro.umontreal.ca/translation/maint/$(PACKAGE)/
PODIR ?= po
refresh-po:
- rm $(PODIR)/*.po && \
+ rm -f $(PODIR)/*.po && \
echo "$(ME): getting translations into po (please ignore the robots.txt ERROR 404)..." && \
wget --no-verbose --directory-prefix $(PODIR) --no-directories --recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
echo 'en@boldquot' > $(PODIR)/LINGUAS && \
projects / thirdparty / gnutls.git / commitdiff
