[xorg-commit-diffs] xc/doc/specs/XDMCP xdmcp.ms,1.1.4.3,1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/doc/specs/XDMCP
In directory pdx:/home/eich/tstbuild/xc/doc/specs/XDMCP

Modified Files:
      Tag: XORG-CURRENT
	xdmcp.ms 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: xdmcp.ms
===================================================================
RCS file: /cvs/xorg/xc/doc/specs/XDMCP/xdmcp.ms,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/xdmcp.ms	5 Mar 2004 13:38:25 -0000	1.1.4.3
+++ b/xdmcp.ms	15 Apr 2004 10:13:38 -0000	1.1.4.4
@@ -1,7 +1,7 @@
 .\" Use eqn, tbl, and -ms
+.\" $Xorg: xdmcp.ms,v 1.3 2000/08/17 19:42:20 cpqbld Exp $
 .\" $XdotOrg$
 .\" $Xorg: xdmcp.ms,v 1.3 2000/08/17 19:42:20 cpqbld Exp $
-.\" $XFree86: xc/doc/specs/XDMCP/xdmcp.ms,v 1.2 2003/07/09 15:27:26 tsi Exp $
 .EQ
 delim @@
 define oc % "\\fR{\\fP" %
@@ -18,7 +18,7 @@
 .ce 7
 \s+2\fBX Display Manager Control Protocol\fP\s-2
 
-\s+1\fBVersion 1.1 DRAFT
+\s+1\fBVersion 1.1
 
 X.Org Standard
 
@@ -34,7 +34,7 @@
 .br
 \&
 .sp 15
-Copyright \(co 1989, 2002 The Open Group
+Copyright \(co 1989, 2004 The Open Group
 .sp 3
 .LP
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -2057,13 +2057,10 @@
 In an unsecure environment, the display must be able to verify that the
 source of the various packets is a trusted manager.  These packets will
 contain authentication information.  As an example of such a system, the
-following discussion describes the "XDM-AUTHENTICATION-1" and
-"XDM-AUTHENTICATION-2" authentication systems.  The "XDM-AUTHENTICATION-1"
-system uses a 56-bit shared private key, and 64 bits of
-authentication data.  "XDM-AUTHENTICATION-2" uses a 256 bit shared private key,
-and 256 bits of authentication data.  Associated example X authorization
-protocol "XDM-AUTHORIZATION-1" and "XDM-AUTHORIZATION-2" will also be 
-discussed. The 56-bit key is represented
+following discussion describes the "XDM-AUTHENTICATION-1" authentication
+system.  This system uses a 56-bit shared private key, and 64 bits of
+authentication data.  An associated example X authorization protocol
+"XDM-AUTHORIZATION-1" will also be discussed.  The 56-bit key is represented
 as a 64-bit number in network order (big endian).  This means that the first
 octet in the representation will be zero.  When incrementing a 64-bit value,
 the 8 octets of data will be interpreted in network order (big endian). 
@@ -2105,19 +2102,14 @@
 beta lineup = "authorization data"
 .EN
 .LP
-"XDM-AUTHENTICATION-1" encryption will use the Data Encryption Standard (DES, 
-FIPS 46-3); blocks shorter than 64 bits will be zero-filled on the right to 
-64 bits.  Blocks longer than 64 bits will use block chaining:
+Encryption will use the Data Encryption Standard (DES, FIPS 46-3); blocks 
+shorter than 64 bits will be zero-filled
+on the right to 64 bits.  Blocks longer than 64 bits will use block chaining:
 .EQ
 oc { D } cc sup kappa lineup = oc { D sub 1 } cc sup kappa " "
 oc { D sub 2 } " " xor " " oc { D sub 1 } cc sup kappa cc sup kappa
 .EN
 .LP
-"XDM-AUTHENTICATION-2" encryption will use the Advanced Encryption Standard 
-(AES, FIPS-197);  blocks shorter than 128 bits will be zero-filled on the right
-to 128 bits.  Blocks longer than 128 bits will use block chaining as shown
-above.
-.LP
 The display generates the first authentication data in the
 .PN Request
 packet:
@@ -2177,15 +2169,6 @@
 .IP \(bu 5
 No packet containing the same pair (@N@, @T@) can have been received
 in the last 1200 seconds (20 minutes).
-.LP
-``XDM-AUTHORIZATION-2'' is identical to ``XDM-AUTHORIZATION-1'', except that
-for TCP connections  @N@ is 256 bits long and contains the 128 bit 
-IPv6 address of the client host followed by the 16 bit port number of the 
-client socket, with the remainder filled with zeros, and @T@ is extended to
-64-bits.  IPv4 addresses are represented as IPv4-mapped IPv6 addresses, with
-an 80-bit prefix of zero bits, followed by a 16-byte value of 0xFFFF, 
-followed by the IPv4 address value, as defined in IETF RFC 2373. Formats for 
-other connections must be  registered.
 .bp
 .EH ''''
 .OH ''''