]>
Commit | Line | Data |
---|---|---|
e3758b4d | 1 | --- xc/programs/xdm/genauth.c.orig 2003-09-25 13:06:32.000000000 +0200 |
2 | +++ xc/programs/xdm/genauth.c 2003-10-01 11:54:11.000000000 +0200 | |
3 | @@ -26,7 +26,7 @@ | |
4 | from The Open Group. | |
5 | ||
6 | */ | |
7 | -/* $XFree86: xc/programs/xdm/genauth.c,v 3.18 2003/09/17 05:48:32 herrb Exp $ */ | |
8 | +/* $XFree86: xc/programs/xdm/genauth.c,v 3.19 2003/09/29 20:25:53 herrb Exp $ */ | |
9 | ||
10 | /* | |
11 | * xdm - display manager daemon | |
12 | @@ -45,7 +45,7 @@ | |
13 | #include <time.h> | |
14 | #define Time_t time_t | |
15 | ||
16 | -#if !defined(ARC4_RANDOM) && !defined(DEV_RANDOM) && !defined(HASXDMAUTH) | |
17 | +#ifdef HASXDMAUTH | |
18 | static unsigned char key[8]; | |
19 | #endif | |
20 | ||
21 | @@ -59,7 +59,10 @@ | |
22 | ||
23 | typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16]; | |
24 | ||
25 | -extern void _XdmcpWrapperToOddParity(); | |
26 | +extern int _XdmcpAuthSetup(unsigned char *, auth_wrapper_schedule); | |
27 | +extern int _XdmcpAuthDoIt(unsigned char *, unsigned char *, | |
28 | + auth_wrapper_schedule, int); | |
29 | +extern void _XdmcpWrapperToOddParity(unsigned char *, unsigned char *); | |
30 | ||
31 | static void | |
32 | longtochars (long l, unsigned char *c) | |
33 | @@ -352,7 +355,7 @@ | |
34 | sum[1] = arc4random(); | |
35 | *(u_char *)sum = 0; | |
36 | ||
37 | - _XdmcpWrapperToOddParity(sum, key); | |
38 | + _XdmcpWrapperToOddParity((unsigned char *)sum, key); | |
39 | #else | |
40 | unsigned char tmpkey[8]; | |
41 | ||
42 | @@ -374,8 +377,9 @@ | |
43 | } | |
44 | #endif | |
45 | /* Try some pseudo-random number genrator daemon next */ | |
46 | - if (prngdSocket != NULL || prngdPort != NULL) { | |
47 | - if (get_prngd_bytes(tmpkey, len, prngdPort, prngdSocket) == 0) { | |
48 | + if (prngdSocket != NULL || prngdPort != 0) { | |
49 | + if (get_prngd_bytes(tmpkey, sizeof(tmpkey), prngdPort, | |
50 | + prngdSocket) == 0) { | |
51 | tmpkey[0] = 0; | |
52 | _XdmcpWrapperToOddParity(tmpkey, key); | |
53 | return; | |
54 | @@ -402,7 +406,7 @@ | |
55 | GenerateAuthData (char *auth, int len) | |
56 | { | |
57 | #ifdef HASXDMAUTH | |
58 | - int bit; | |
59 | + int i, bit; | |
60 | auth_wrapper_schedule schedule; | |
61 | unsigned char data[8]; | |
62 | static int xdmcpAuthInited; |