diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-08-04 10:42:57 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2013-08-11 11:29:44 +0200 |
| commit | 66514a4af7eaa47e8718434356d7efce95e570cf (patch) | |
| tree | 8fbbf99cbe009a508091a7646a4532a48f5d1abd | |
| parent | 0b443c1b769b9c9a3b45b4252afe07e18b709ff4 (diff) | |
Use arc4random when available to produce the XDM-AUTHENTICATION1 key
arc4random() and associated functions can be found in libbsd on
GNU/Linux systems.
Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | Key.c | 10 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 12 insertions, 1 deletions
@@ -32,6 +32,11 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xmd.h> #include <X11/Xdmcp.h> +#ifdef HAVE_LIBBSD +#include <bsd/stdlib.h> /* for arc4random_buf() */ +#endif + +#ifndef HAVE_ARC4RANDOM_BUF static void getbits (long data, unsigned char *dst) { @@ -40,6 +45,7 @@ getbits (long data, unsigned char *dst) dst[2] = (data >> 16) & 0xff; dst[3] = (data >> 24) & 0xff; } +#endif #define Time_t time_t @@ -59,6 +65,7 @@ getbits (long data, unsigned char *dst) void XdmcpGenerateKey (XdmAuthKeyPtr key) { +#ifndef HAVE_ARC4RANDOM_BUF long lowbits, highbits; srandom ((int)getpid() ^ time((Time_t *)0)); @@ -66,6 +73,9 @@ XdmcpGenerateKey (XdmAuthKeyPtr key) highbits = random (); getbits (lowbits, key->data); getbits (highbits, key->data + 4); +#else + arc4random_buf(key->data, 8); +#endif } int diff --git a/configure.ac b/configure.ac index 08c046a..d8ddfae 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,8 @@ AC_PROG_LN_S AC_SEARCH_LIBS([recvfrom],[socket]) # Checks for library functions. -AC_CHECK_FUNCS([srand48 lrand48]) +AC_CHECK_LIB([bsd], [arc4random_buf]) +AC_CHECK_FUNCS([srand48 lrand48 arc4random_buf]) # Obtain compiler/linker options for depedencies PKG_CHECK_MODULES(XDMCP, xproto) |