Attachment #4049 for bug #9780

(-)a/hw/xwin/InitOutput.c (-2 lines)

Lines 1013-1023 InitOutput (ScreenInfo screenInfo, int argc, char argv[])	Link Here

1013

1014

#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

1014

#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

1015

1016

#if defined(XCSECURITY)

1017

  /* Generate a cookie used by internal clients for authorization */

1016

  /* Generate a cookie used by internal clients for authorization */

1018

  if (g_fXdmcpEnabled || g_fAuthEnabled)

1017

  if (g_fXdmcpEnabled || g_fAuthEnabled)

1019

    winGenerateAuthorization ();

1018

    winGenerateAuthorization ();

1020

#endif

1021

1019

1022

  /* Perform some one time initialization */

1020

  /* Perform some one time initialization */

1023

  if (1 == serverGeneration)

1021

  if (1 == serverGeneration)

(-)a/hw/xwin/win.h (-2 / +1 lines)

Lines 768-777 winAllocateCmapPrivates (ColormapPtr pCmap);	Link Here

768

*/

768

*/

769

770

#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

770

#if defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)

771

# if defined(XCSECURITY)

772

Bool

771

Bool

773

winGenerateAuthorization (void);

772

winGenerateAuthorization (void);

774

# endif

773

void winSetAuthorization(void);

775

#endif

774

#endif

776

775

777

776




#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif
#if defined(XCSECURITY)
/*
 *Copyright (C) 2003-2004 Harold L Hunt II All Rights Reserved.
 *

 * Authors:	Harold L Hunt II
 */

#ifdef HAVE_XWIN_CONFIG_H
#include <xwin-config.h>
#endif

#include "win.h"

/* Includes for authorization */
#include <X11/Xauth.h>
#include "securitysrv.h"
#include <X11/extensions/securstr.h>


/*



/*
 * Locals
 */

static XID g_authId = 0;
static unsigned int g_uiAuthDataLen = 0;
static char *g_pAuthData = NULL;

/*
 * Code to generate a MIT-MAGIC-COOKIE-1, copied from under XCSECURITY
 */

#ifndef XCSECURITY
static
void
GenerateRandomData (int len, char *buf)
{
    int fd;

    fd = open("/dev/urandom", O_RDONLY);
    read(fd, buf, len);
    close(fd);
}


static char cookie[16]; /* 128 bits */

XID
static MitGenerateCookie (
    unsigned	data_length,
    char	*data,
    XID		id,
    unsigned	*data_length_return,
    char	**data_return)
{
    int i = 0;
    int status;

    while (data_length--)
    {
	cookie[i++] += *data++;
	if (i >= sizeof (cookie)) i = 0;
    }
    GenerateRandomData(sizeof (cookie), cookie);
    status = MitAddCookie(sizeof (cookie), cookie, id);
    if (!status)
    {
	id = -1;
    }
    else
    {
	*data_return = cookie;
	*data_length_return = sizeof (cookie);
    }
    return id;
}

static
XID
GenerateAuthorization(
	unsigned name_length,
	char	*name,
	unsigned data_length,
	char	*data,
	unsigned *data_length_return,
	char	**data_return)
{
    return MitGenerateCookie(data_length, data,
                             FakeClientID(0), data_length_return, data_return);
}
#endif

/*
 * Generate authorization cookie for internal server clients

      ErrorF ("winGenerateAuthorization - GenerateAuthorization failed\n");
      goto auth_bailout;
    }

  else
    {
      winDebug("winGenerateAuthorization - GenerateAuthorization success!\n"
	      "AuthDataLen: %d AuthData: %s\n",
	      g_uiAuthDataLen, g_pAuthData);
    }

#ifdef XCSECURITY
  /* Allocate structure for additional auth information */
  pAuth = (SecurityAuthorizationPtr) 
    xalloc (sizeof (SecurityAuthorizationRec));

  
  /* Don't free the auth data, since it is still used internally */
  pAuth = NULL;
#endif

  return TRUE;

 auth_bailout:

  
  return FALSE;
}

/* Use our generated cookie for authentication */
void
winSetAuthorization(void)
{
  XSetAuthorization (AUTH_NAME,
		     strlen (AUTH_NAME),
		     g_pAuthData,
		     g_uiAuthDataLen);
}




#ifdef __CYGWIN__
#include <errno.h>
#endif
#include "X11/Xauth.h"
#include <X11/Xlibint.h>


/*
 * Constants
 */

#define AUTH_NAME	"MIT-MAGIC-COOKIE-1"


/*
 * References to external symbols
 */

extern Bool		g_fUnicodeClipboard;
extern unsigned long	serverGeneration;
#if defined(XCSECURITY)
extern unsigned int	g_uiAuthDataLen;
extern char		*g_pAuthData;
#endif
extern Bool		g_fClipboardStarted;
extern HWND		g_hwndClipboard;
extern void		*g_pClipboardDisplay;

      pthread_exit (NULL);
    }

#if defined(XCSECURITY)
  /* Use our generated cookie for authentication */
  winSetAuthorization();
		     strlen (AUTH_NAME),
		     g_pAuthData,
		     g_uiAuthDataLen);
#endif

  /* Set error handler */
  XSetErrorHandler (winClipboardErrorHandler);




#endif
#define WIN_JMP_OKAY		0
#define WIN_JMP_ERROR_IO	2
#define AUTH_NAME		"MIT-MAGIC-COOKIE-1"


/*
 * Local structures


extern char *display;
extern void ErrorF (const char* /*f*/, ...);
#if defined(XCSECURITY)
extern unsigned int	g_uiAuthDataLen;
extern char		*g_pAuthData;
#endif


/*
 * Prototypes for local functions


  /* Print the display connection string */
  ErrorF ("winMultiWindowXMsgProc - DISPLAY=%s\n", pszDisplay);

  /* Use our generated cookie for authentication */
  winSetAuthorization();
  
  /* Initialize retry count */
  iRetries = 0;

  /* Print the display connection string */
  ErrorF ("winInitMultiWindowWM - DISPLAY=%s\n", pszDisplay);

#if defined(XCSECURITY)
  /* Use our generated cookie for authentication */
  winSetAuthorization();

		     g_pAuthData,
		     g_uiAuthDataLen);
#endif
  
  /* Open the X display */
  do
    {

(-)a/include/os.h (-1 / +2 lines)

Lines 388-393 extern int AddAuthorization(	Link Here

388

    unsigned int	/*data_length*/,

388

    unsigned int	/*data_length*/,

389

    char *		/*data*/);

389

    char *		/*data*/);

390

391

#ifdef XCSECURITY

391

extern XID GenerateAuthorization(

392

extern XID GenerateAuthorization(

392

    unsigned int   /* name_length */,

393

    unsigned int   /* name_length */,

393

    char	*  /* name */,

394

    char	*  /* name */,

Lines 395-400 extern XID GenerateAuthorization(	Link Here

395

    char	*  /* data */,

396

    char	*  /* data */,

396

    unsigned int * /* data_length_return */,

397

    unsigned int * /* data_length_return */,

397

    char	** /* data_return */);

398

    char	** /* data_return */);

399

#endif

398

400

399

extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);

401

extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);

400

402

401

Return to bug 9780