Check-in [2fb4a2e5b1]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Add a cast for a char * vs unsigned char * conflict.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2fb4a2e5b18ca3f173ba08d199ee4e47f7240c86
User & Date: ben 2003-01-11 08:08:46.000
Context
2003-01-11
08:20
Move the prototype for platform_get_x11_auth() from x11fwd.c to ssh.h so that it can be checked against the implementation. check-in: 81acda317b user: ben tags: trunk
08:08
Add a cast for a char * vs unsigned char * conflict. check-in: 2fb4a2e5b1 user: ben tags: trunk
08:08
const fallout from Simon's X forwarding changes. check-in: f97554fe73 user: ben tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to x11fwd.c.
397
398
399
400
401
402
403
404

405
406
407
408
409
410
411
                realauthlen = 24;
		memset(realauthdata, 0, 24);
		memcpy(realauthdata, pr->auth->realdata, 8);
		PUT_32BIT_MSB_FIRST(realauthdata+8, ip);
		PUT_16BIT_MSB_FIRST(realauthdata+12, port);
		t = time(NULL);
		PUT_32BIT_MSB_FIRST(realauthdata+14, t);
		des_encrypt_xdmauth(pr->auth->realdata+9, realauthdata, 24);

	    }
            /* implement other auth methods here if required */

            PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 6, authstrlen);
            PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 8, realauthlen);
        
            sk_write(s, (char *)pr->firstpkt, 12);







|
>







397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
                realauthlen = 24;
		memset(realauthdata, 0, 24);
		memcpy(realauthdata, pr->auth->realdata, 8);
		PUT_32BIT_MSB_FIRST(realauthdata+8, ip);
		PUT_16BIT_MSB_FIRST(realauthdata+12, port);
		t = time(NULL);
		PUT_32BIT_MSB_FIRST(realauthdata+14, t);
		des_encrypt_xdmauth(pr->auth->realdata+9,
				    (unsigned char *)realauthdata, 24);
	    }
            /* implement other auth methods here if required */

            PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 6, authstrlen);
            PUT_16BIT(pr->firstpkt[0], pr->firstpkt + 8, realauthlen);
        
            sk_write(s, (char *)pr->firstpkt, 12);