frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #1612: Use a stronger PRNG. 

Currently just reads from /dev/urandom, and only on Linux.
This commit is contained in:
Adam Jackson 2007-11-16 19:53:11 -05:00
parent 20fd478324
commit 514ba4ca72
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -175,6 +175,12 @@ fi
AC_CHECK_FUNC([dlopen], [], AC_CHECK_FUNC([dlopen], [],
AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
case $host_os in
linux*)
AC_DEFINE(HAVE_URANDOM, 1, [Has /dev/urandom]) ;;
*) ;;
esac
dnl Checks for library functions. dnl Checks for library functions.
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \ AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \

3
include/dix-config.h.in
View File

@ -240,6 +240,9 @@
/* Define to 1 if you have the <unistd.h> header file. */ /* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H #undef HAVE_UNISTD_H
/* Have /dev/urandom */
#undef HAVE_URANDOM
/* Define to 1 if you have the `vprintf' function. */ /* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF #undef HAVE_VPRINTF

16
os/auth.c
View File

@ -325,6 +325,20 @@ GenerateAuthorization(
return -1; return -1;
} }
#ifdef HAVE_URANDOM
void
GenerateRandomData (int len, char *buf)
{
int fd;
fd = open("/dev/urandom", O_RDONLY);
read(fd, buf, len);
close(fd);
}
#else /* !HAVE_URANDOM */
/* A random number generator that is more unpredictable /* A random number generator that is more unpredictable
than that shipped with some systems. than that shipped with some systems.
This code is taken from the C standard. */ This code is taken from the C standard. */
@ -362,4 +376,6 @@ GenerateRandomData (int len, char *buf)
/* XXX add getrusage, popen("ps -ale") */ /* XXX add getrusage, popen("ps -ale") */
} }
#endif /* HAVE_URANDOM */
#endif /* XCSECURITY */ #endif /* XCSECURITY */