Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 197 insertions, 0 deletions

diff --git a/xorg-server/os/mitauth.c b/xorg-server/os/mitauth.c
new file mode 100644
index 000000000..db66c44fb
--- /dev/null
+++ b/xorg-server/os/mitauth.c
@@ -0,0 +1,197 @@
+/*
+
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+/*
+ * MIT-MAGIC-COOKIE-1 authorization scheme
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "osdep.h"
+#include "dixstruct.h"
+
+static struct auth {
+    struct auth	*next;
+    unsigned short	len;
+    char	*data;
+    XID		id;
+} *mit_auth;
+
+int
+MitAddCookie (
+    unsigned short	data_length,
+    char		*data,
+    XID			id)
+{
+    struct auth	*new;
+
+    new = (struct auth *) xalloc (sizeof (struct auth));
+    if (!new)
+	return 0;
+    new->data = (char *) xalloc ((unsigned) data_length);
+    if (!new->data) {
+	xfree(new);
+	return 0;
+    }
+    new->next = mit_auth;
+    mit_auth = new;
+    memmove(new->data, data, (int) data_length);
+    new->len = data_length;
+    new->id = id;
+    return 1;
+}
+
+XID
+MitCheckCookie (
+    unsigned short	data_length,
+    char		*data,
+    ClientPtr		client,
+    char		**reason)
+{
+    struct auth	*auth;
+
+    for (auth = mit_auth; auth; auth=auth->next) {
+        if (data_length == auth->len &&
+	   memcmp (data, auth->data, (int) data_length) == 0)
+	    return auth->id;
+    }
+    *reason = "Invalid MIT-MAGIC-COOKIE-1 key";
+    return (XID) -1;
+}
+
+int
+MitResetCookie (void)
+{
+    struct auth	*auth, *next;
+
+    for (auth = mit_auth; auth; auth=next) {
+	next = auth->next;
+	xfree (auth->data);
+	xfree (auth);
+    }
+    mit_auth = 0;
+    return 0;
+}
+
+XID
+MitToID (
+	unsigned short	data_length,
+	char		*data)
+{
+    struct auth	*auth;
+
+    for (auth = mit_auth; auth; auth=auth->next) {
+	if (data_length == auth->len &&
+	    memcmp (data, auth->data, data_length) == 0)
+	    return auth->id;
+    }
+    return (XID) -1;
+}
+
+int
+MitFromID (
+	XID		id,
+	unsigned short	*data_lenp,
+	char		**datap)
+{
+    struct auth	*auth;
+
+    for (auth = mit_auth; auth; auth=auth->next) {
+	if (id == auth->id) {
+	    *data_lenp = auth->len;
+	    *datap = auth->data;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+int
+MitRemoveCookie (
+	unsigned short	data_length,
+	char		*data)
+{
+    struct auth	*auth, *prev;
+
+    prev = 0;
+    for (auth = mit_auth; auth; prev = auth, auth=auth->next) {
+	if (data_length == auth->len &&
+	    memcmp (data, auth->data, data_length) == 0)
+ 	{
+	    if (prev)
+		prev->next = auth->next;
+	    else
+		mit_auth = auth->next;
+	    xfree (auth->data);
+	    xfree (auth);
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+#ifdef XCSECURITY
+
+static char cookie[16]; /* 128 bits */
+
+XID
+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;
+}
+
+#endif /* XCSECURITY */