diff options
| -rw-r--r-- | include/dm.h | 6 | ||||
| -rw-r--r-- | include/dm_auth.h | 8 | ||||
| -rw-r--r-- | man/xdm.man | 30 | ||||
| -rw-r--r-- | xdm/genauth.c | 13 | ||||
| -rw-r--r-- | xdm/resource.c | 36 |
5 files changed, 0 insertions, 93 deletions
diff --git a/include/dm.h b/include/dm.h index 82bed60..17042e6 100644 --- a/include/dm.h +++ b/include/dm.h @@ -248,12 +248,6 @@ extern int autoRescan; extern int removeDomainname; extern char *keyFile; extern char **exportList; -# if !defined(HAVE_ARC4RANDOM) -extern char *randomFile; -extern char *prngdSocket; -extern int prngdPort; -# endif - extern char *greeterLib; extern char *willing; extern int choiceTimeout; /* chooser choice timeout */ diff --git a/include/dm_auth.h b/include/dm_auth.h index dc3ff6d..533f67d 100644 --- a/include/dm_auth.h +++ b/include/dm_auth.h @@ -51,13 +51,5 @@ extern void SetUserAuthorization (struct display *d, struct verify_info *verify) /* genauth.c */ extern int GenerateAuthData (char *auth, int len); -# if !defined(HAVE_ARC4RANDOM) -extern void AddPreGetEntropy (void); -extern void AddOtherEntropy (void); -extern void AddTimerEntropy (void); -# endif - -/* prngc.c */ -extern int get_prngd_bytes(char *, int, unsigned short, char *); #endif /* _DM_AUTH_H_ */ diff --git a/man/xdm.man b/man/xdm.man index b44545f..39c1344 100644 --- a/man/xdm.man +++ b/man/xdm.man @@ -274,36 +274,6 @@ to reread these files by sending a SIGHUP to the main process. A list of additional environment variables, separated by white space, to pass on to the \fIXsetup\fP, \fIXstartup\fP, \fIXsession\fP, and \fIXreset\fP programs. -.\" The command "if 'x.A'x' .ig" causes everything up to .. to be ignored -.\" if A is replaced by an empty string in the sed processing, otherwise -.\" it will be output as normal. -.if !'x.ARC4_RANDOM'x.' .ig -.IP \fBDisplayManager.randomFile\fP -A file to checksum to generate the seed of authorization keys. -This should be a file that changes frequently. -The default is \fI/dev/mem\fP. -.. -.if 'x.DEV_RANDOM'x.' .ig -.IP \fBDisplayManager.randomDevice\fP -A file to read 8 bytes from to generate the seed of authorization keys. -The default is \fI DEV_RANDOM \fP. If this file cannot be read, or if a -read blocks for more than 5 seconds, xdm falls back to using a checksum -of \fBDisplayManager.randomFile\fP to generate the seed. -.. -.if !'x.ARC4_RANDOM'x.' .ig -.IP \fBDisplayManager.prngdSocket\fP -.IP \fBDisplayManager.prngPort\fP -A UNIX domain socket name or a TCP socket port number on local host on -which a Pseudo-Random Number Generator Daemon, like EGD -(http://egd.sourceforge.net) is listening, in order to generate the -autorization keys. Either a non null port or a valid socket name must -be specified. The default is to use the Unix-domain socket -\fI/tmp/entropy\fP. -.PP -On systems that don't have such a daemon, a fall-back entropy -gathering system, based on various log file contents hashed by the MD5 -algorithm is used instead. -.. .IP \fBDisplayManager.greeterLib\fP On systems that support a dynamically-loadable greeter library, the name of the library. The default is diff --git a/xdm/genauth.c b/xdm/genauth.c index bc7cf59..3c21e11 100644 --- a/xdm/genauth.c +++ b/xdm/genauth.c @@ -85,21 +85,8 @@ GenerateAuthData (char *auth, int len) static int xdmcpAuthInited; long ldata[2]; -# ifndef HAVE_ARC4RANDOM -# ifdef ITIMER_REAL - struct timeval now; - - X_GETTIMEOFDAY (&now); - ldata[0] = now.tv_usec; - ldata[1] = now.tv_sec; -# else - ldata[0] = time ((long *) 0); - ldata[1] = getpid (); -# endif -# else ldata[0] = arc4random(); ldata[1] = arc4random(); -# endif longtochars (ldata[0], data+0); longtochars (ldata[1], data+4); diff --git a/xdm/resource.c b/xdm/resource.c index ea499ec..753b4da 100644 --- a/xdm/resource.c +++ b/xdm/resource.c @@ -54,17 +54,6 @@ int autoRescan; int removeDomainname; char *keyFile; char **exportList; -#if !defined(HAVE_ARC4RANDOM) -char *randomFile; -#endif -#ifdef DEV_RANDOM -char *randomDevice; -#endif -#if !defined(HAVE_ARC4RANDOM) -char *prngdSocket; -int prngdPort; -#endif - char *greeterLib; char *willing; int choiceTimeout; /* chooser choice timeout */ @@ -120,19 +109,6 @@ int choiceTimeout; /* chooser choice timeout */ #ifndef DEF_ACCESS_FILE # define DEF_ACCESS_FILE "" #endif -#ifndef DEF_RANDOM_FILE -# define DEF_RANDOM_FILE "/dev/mem" -#endif -#ifdef __SCO__ -# define DEF_PRNGD_SOCKET "/etc/egd-pool" -#else -# ifndef DEF_PRNGD_SOCKET -# define DEF_PRNGD_SOCKET "/tmp/entropy" -# endif -#endif -#ifndef DEF_PRNGD_PORT -# define DEF_PRNGD_PORT "0" -#endif #ifndef DEF_GREETER_LIB # define DEF_GREETER_LIB "/usr/lib/X11/xdm/libXdmGreet.so" #endif @@ -165,18 +141,6 @@ struct dmResources { DEF_KEY_FILE} , { "exportList", "ExportList", DM_ARGV, (char **) &exportList, ""} , -#if !defined(HAVE_ARC4RANDOM) -{ "randomFile", "RandomFile", DM_STRING, &randomFile, - DEF_RANDOM_FILE} , -{ "prngdSocket", "PrngdSocket", DM_STRING, &prngdSocket, - DEF_PRNGD_SOCKET}, -{ "prngdPort", "PrngdPort", DM_INT, (char **) &prngdPort, - DEF_PRNGD_PORT}, -#endif -#ifdef DEV_RANDOM -{ "randomDevice", "RandomDevice", DM_STRING, &randomDevice, - DEV_RANDOM} , -#endif { "greeterLib", "GreeterLib", DM_STRING, &greeterLib, DEF_GREETER_LIB} , { "choiceTimeout","ChoiceTimeout",DM_INT, (char **) &choiceTimeout, |