summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DAofA8.c10
-rw-r--r--Wrap.h8
-rw-r--r--Wraphelp.README.crypto64
-rw-r--r--Wraphelp.c497
-rw-r--r--include/X11/Xdmcp.h2
5 files changed, 571 insertions, 10 deletions
diff --git a/DAofA8.c b/DAofA8.c
index 0e818a3..5ec156f 100644
--- a/DAofA8.c
+++ b/DAofA8.c
@@ -1,4 +1,4 @@
-/*
+/* $Xdotorg: $
* $Xorg: DAofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $
*
*
@@ -38,9 +38,11 @@ XdmcpDisposeARRAYofARRAY8 (array)
{
int i;
- for (i = 0; i < (int)array->length; i++)
- XdmcpDisposeARRAY8 (&array->data[i]);
- if (array->data != NULL) Xfree (array->data);
+ if (array->data != NULL) {
+ for (i = 0; i < (int)array->length; i++)
+ XdmcpDisposeARRAY8 (&array->data[i]);
+ Xfree (array->data);
+ }
array->length = 0;
array->data = NULL;
}
diff --git a/Wrap.h b/Wrap.h
index fb51199..9c57e1d 100644
--- a/Wrap.h
+++ b/Wrap.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/Xdmcp/Wrap.h,v 1.1.4.2.4.1 2004/03/04 17:46:53 eich Exp $ */
+/* $XdotOrg: xc/lib/Xdmcp/Wrap.h,v 1.5 2004/08/22 01:02:25 jg Exp $ */
/* $Xorg: Wrap.h,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */
/*
* header file for compatibility with something useful
@@ -13,9 +13,7 @@ typedef struct auth_ks_struct { auth_cblock _; } auth_wrapper_schedule[16];
extern void _XdmcpWrapperToOddParity (unsigned char *in, unsigned char *out);
#ifdef HASXDMAUTH
-/* They're really void but that would mean changing Wraphelp.c as well
- which isnt in version control. */
-extern int _XdmcpAuthSetup (auth_cblock key, auth_wrapper_schedule schedule);
-extern int _XdmcpAuthDoIt (auth_cblock input, auth_cblock output,
+extern void _XdmcpAuthSetup (auth_cblock key, auth_wrapper_schedule schedule);
+extern void _XdmcpAuthDoIt (auth_cblock input, auth_cblock output,
auth_wrapper_schedule schedule, int edflag);
#endif
diff --git a/Wraphelp.README.crypto b/Wraphelp.README.crypto
new file mode 100644
index 0000000..20c34c0
--- /dev/null
+++ b/Wraphelp.README.crypto
@@ -0,0 +1,64 @@
+Export Requirements.
+
+You may not export or re-export this software or any copy or
+adaptation in violation of any applicable laws or regulations.
+
+Without limiting the generality of the foregoing, hardware, software,
+technology or services provided under this license agreement may not
+be exported, reexported, transferred or downloaded to or within (or to
+a national resident of) countries under U.S. economic embargo
+including the following countries:
+
+Cuba, Iran, Libya, North Korea, Sudan and Syria. This list is subject
+to change.
+
+Hardware, software, technology or services may not be exported,
+reexported, transferred or downloaded to persons or entities listed on
+the U.S. Department of Commerce Denied Persons List, Entity List of
+proliferation concern or on any U.S. Treasury Department Designated
+Nationals exclusion list, or to parties directly or indirectly
+involved in the development or production of nuclear, chemical,
+biological weapons or in missile technology programs as specified in
+the U.S. Export Administration Regulations (15 CFR 744).
+
+By accepting this license agreement you confirm that you are not
+located in (or a national resident of) any country under U.S. economic
+embargo, not identified on any U.S. Department of Commerce Denied
+Persons List, Entity List or Treasury Department Designated Nationals
+exclusion list, and not directly or indirectly involved in the
+development or production of nuclear, chemical, biological weapons or
+in missile technology programs as specified in the U.S. Export
+Administration Regulations.
+
+Software available on this web site contains cryptography and is
+therefore subject to US government export control under the
+U.S. Export Administration Regulations ("EAR"). EAR Part 740.13(e)
+allows the export and reexport of publicly available encryption source
+code that is not subject to payment of license fee or royalty
+payment. Object code resulting from the compiling of such source code
+may also be exported and reexported under this provision if publicly
+available and not subject to a fee or payment other than reasonable
+and customary fees for reproduction and distribution. This kind of
+encryption source code and the corresponding object code may be
+exported or reexported without prior U.S. government export license
+authorization provided that the U.S. government is notified about the
+Internet location of the software.
+
+The open source software available on this web site is publicly
+available without license fee or royalty payment, and all binary
+software is compiled from the source code. The U.S. government has
+been notified about this site and the location site for the source
+code. Therefore, the source code and compiled object code may be
+downloaded and exported under U.S. export license exception (without a
+U.S. export license) in accordance with the further restrictions
+outlined above regarding embargoed countries, restricted persons and
+restricted end uses.
+
+Local Country Import Requirements. The software you are about to
+download contains cryptography technology. Some countries regulate the
+import, use and/or export of certain products with cryptography. The
+X.org Foundation makes no claims as to the applicability of local
+country import, use and/or export regulations in relation to the
+download of this product. If you are located outside the U.S. and
+Canada you are advised to consult your local country regulations to
+insure compliance.
diff --git a/Wraphelp.c b/Wraphelp.c
new file mode 100644
index 0000000..1971d62
--- /dev/null
+++ b/Wraphelp.c
@@ -0,0 +1,497 @@
+/*
+ * $Xorg: A8Eq.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $
+ *
+ */
+
+#include <sys/types.h>
+#include <X11/Xmd.h>
+#include "Wrap.h"
+
+/* des routines for non-usa - eay 10/9/1991 eay@psych.psy.uq.oz.au
+ * These routines were written for speed not size so they are bigger than
+ * needed. I have removed some of the loop unrolling, this will reduce
+ * code size at the expense of some speed.
+ * 25/9/1991 eay - much faster _XdmcpAuthSetup (4 times faster).
+ * 19/9/1991 eay - cleaned up the IP and FP code.
+ * 10/9/1991 eay - first release.
+ * The des routines this file has been made from can be found in
+ * ftp.psy.uq.oz.au /pub/DES
+ * This particular version derived from OpenBSD Revsion 1.3.
+ */
+
+/*
+ *
+ * Export Requirements.
+ * You may not export or re-export this software or any copy or
+ * adaptation in violation of any applicable laws or regulations.
+ *
+ * Without limiting the generality of the foregoing, hardware, software,
+ * technology or services provided under this license agreement may not
+ * be exported, reexported, transferred or downloaded to or within (or to
+ * a national resident of) countries under U.S. economic embargo
+ * including the following countries:
+ *
+ * Cuba, Iran, Libya, North Korea, Sudan and Syria. This list is subject
+ * to change.
+ *
+ * Hardware, software, technology or services may not be exported,
+ * reexported, transferred or downloaded to persons or entities listed on
+ * the U.S. Department of Commerce Denied Persons List, Entity List of
+ * proliferation concern or on any U.S. Treasury Department Designated
+ * Nationals exclusion list, or to parties directly or indirectly
+ * involved in the development or production of nuclear, chemical,
+ * biological weapons or in missile technology programs as specified in
+ * the U.S. Export Administration Regulations (15 CFR 744).
+ *
+ * By accepting this license agreement you confirm that you are not
+ * located in (or a national resident of) any country under U.S. economic
+ * embargo, not identified on any U.S. Department of Commerce Denied
+ * Persons List, Entity List or Treasury Department Designated Nationals
+ * exclusion list, and not directly or indirectly involved in the
+ * development or production of nuclear, chemical, biological weapons or
+ * in missile technology programs as specified in the U.S. Export
+ * Administration Regulations.
+ *
+ *
+ * Local Country Import Requirements. The software you are about to
+ * download contains cryptography technology. Some countries regulate the
+ * import, use and/or export of certain products with cryptography. The
+ * X.org Foundation makes no claims as to the applicability of local
+ * country import, use and/or export regulations in relation to the
+ * download of this product. If you are located outside the U.S. and
+ * Canada you are advised to consult your local country regulations to
+ * insure compliance.
+ */
+
+static CARD32 skb[8][64] = {
+ /* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+ { 0x00000000,0x00000010,0x20000000,0x20000010,
+ 0x00010000,0x00010010,0x20010000,0x20010010,
+ 0x00000800,0x00000810,0x20000800,0x20000810,
+ 0x00010800,0x00010810,0x20010800,0x20010810,
+ 0x00000020,0x00000030,0x20000020,0x20000030,
+ 0x00010020,0x00010030,0x20010020,0x20010030,
+ 0x00000820,0x00000830,0x20000820,0x20000830,
+ 0x00010820,0x00010830,0x20010820,0x20010830,
+ 0x00080000,0x00080010,0x20080000,0x20080010,
+ 0x00090000,0x00090010,0x20090000,0x20090010,
+ 0x00080800,0x00080810,0x20080800,0x20080810,
+ 0x00090800,0x00090810,0x20090800,0x20090810,
+ 0x00080020,0x00080030,0x20080020,0x20080030,
+ 0x00090020,0x00090030,0x20090020,0x20090030,
+ 0x00080820,0x00080830,0x20080820,0x20080830,
+ 0x00090820,0x00090830,0x20090820,0x20090830 },
+ /* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
+ { 0x00000000,0x02000000,0x00002000,0x02002000,
+ 0x00200000,0x02200000,0x00202000,0x02202000,
+ 0x00000004,0x02000004,0x00002004,0x02002004,
+ 0x00200004,0x02200004,0x00202004,0x02202004,
+ 0x00000400,0x02000400,0x00002400,0x02002400,
+ 0x00200400,0x02200400,0x00202400,0x02202400,
+ 0x00000404,0x02000404,0x00002404,0x02002404,
+ 0x00200404,0x02200404,0x00202404,0x02202404,
+ 0x10000000,0x12000000,0x10002000,0x12002000,
+ 0x10200000,0x12200000,0x10202000,0x12202000,
+ 0x10000004,0x12000004,0x10002004,0x12002004,
+ 0x10200004,0x12200004,0x10202004,0x12202004,
+ 0x10000400,0x12000400,0x10002400,0x12002400,
+ 0x10200400,0x12200400,0x10202400,0x12202400,
+ 0x10000404,0x12000404,0x10002404,0x12002404,
+ 0x10200404,0x12200404,0x10202404,0x12202404 },
+ /* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
+ { 0x00000000,0x00000001,0x00040000,0x00040001,
+ 0x01000000,0x01000001,0x01040000,0x01040001,
+ 0x00000002,0x00000003,0x00040002,0x00040003,
+ 0x01000002,0x01000003,0x01040002,0x01040003,
+ 0x00000200,0x00000201,0x00040200,0x00040201,
+ 0x01000200,0x01000201,0x01040200,0x01040201,
+ 0x00000202,0x00000203,0x00040202,0x00040203,
+ 0x01000202,0x01000203,0x01040202,0x01040203,
+ 0x08000000,0x08000001,0x08040000,0x08040001,
+ 0x09000000,0x09000001,0x09040000,0x09040001,
+ 0x08000002,0x08000003,0x08040002,0x08040003,
+ 0x09000002,0x09000003,0x09040002,0x09040003,
+ 0x08000200,0x08000201,0x08040200,0x08040201,
+ 0x09000200,0x09000201,0x09040200,0x09040201,
+ 0x08000202,0x08000203,0x08040202,0x08040203,
+ 0x09000202,0x09000203,0x09040202,0x09040203 },
+ /* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
+ { 0x00000000,0x00100000,0x00000100,0x00100100,
+ 0x00000008,0x00100008,0x00000108,0x00100108,
+ 0x00001000,0x00101000,0x00001100,0x00101100,
+ 0x00001008,0x00101008,0x00001108,0x00101108,
+ 0x04000000,0x04100000,0x04000100,0x04100100,
+ 0x04000008,0x04100008,0x04000108,0x04100108,
+ 0x04001000,0x04101000,0x04001100,0x04101100,
+ 0x04001008,0x04101008,0x04001108,0x04101108,
+ 0x00020000,0x00120000,0x00020100,0x00120100,
+ 0x00020008,0x00120008,0x00020108,0x00120108,
+ 0x00021000,0x00121000,0x00021100,0x00121100,
+ 0x00021008,0x00121008,0x00021108,0x00121108,
+ 0x04020000,0x04120000,0x04020100,0x04120100,
+ 0x04020008,0x04120008,0x04020108,0x04120108,
+ 0x04021000,0x04121000,0x04021100,0x04121100,
+ 0x04021008,0x04121008,0x04021108,0x04121108 },
+ /* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
+ { 0x00000000,0x10000000,0x00010000,0x10010000,
+ 0x00000004,0x10000004,0x00010004,0x10010004,
+ 0x20000000,0x30000000,0x20010000,0x30010000,
+ 0x20000004,0x30000004,0x20010004,0x30010004,
+ 0x00100000,0x10100000,0x00110000,0x10110000,
+ 0x00100004,0x10100004,0x00110004,0x10110004,
+ 0x20100000,0x30100000,0x20110000,0x30110000,
+ 0x20100004,0x30100004,0x20110004,0x30110004,
+ 0x00001000,0x10001000,0x00011000,0x10011000,
+ 0x00001004,0x10001004,0x00011004,0x10011004,
+ 0x20001000,0x30001000,0x20011000,0x30011000,
+ 0x20001004,0x30001004,0x20011004,0x30011004,
+ 0x00101000,0x10101000,0x00111000,0x10111000,
+ 0x00101004,0x10101004,0x00111004,0x10111004,
+ 0x20101000,0x30101000,0x20111000,0x30111000,
+ 0x20101004,0x30101004,0x20111004,0x30111004 },
+ /* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
+ { 0x00000000,0x08000000,0x00000008,0x08000008,
+ 0x00000400,0x08000400,0x00000408,0x08000408,
+ 0x00020000,0x08020000,0x00020008,0x08020008,
+ 0x00020400,0x08020400,0x00020408,0x08020408,
+ 0x00000001,0x08000001,0x00000009,0x08000009,
+ 0x00000401,0x08000401,0x00000409,0x08000409,
+ 0x00020001,0x08020001,0x00020009,0x08020009,
+ 0x00020401,0x08020401,0x00020409,0x08020409,
+ 0x02000000,0x0A000000,0x02000008,0x0A000008,
+ 0x02000400,0x0A000400,0x02000408,0x0A000408,
+ 0x02020000,0x0A020000,0x02020008,0x0A020008,
+ 0x02020400,0x0A020400,0x02020408,0x0A020408,
+ 0x02000001,0x0A000001,0x02000009,0x0A000009,
+ 0x02000401,0x0A000401,0x02000409,0x0A000409,
+ 0x02020001,0x0A020001,0x02020009,0x0A020009,
+ 0x02020401,0x0A020401,0x02020409,0x0A020409 },
+ /* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
+ { 0x00000000,0x00000100,0x00080000,0x00080100,
+ 0x01000000,0x01000100,0x01080000,0x01080100,
+ 0x00000010,0x00000110,0x00080010,0x00080110,
+ 0x01000010,0x01000110,0x01080010,0x01080110,
+ 0x00200000,0x00200100,0x00280000,0x00280100,
+ 0x01200000,0x01200100,0x01280000,0x01280100,
+ 0x00200010,0x00200110,0x00280010,0x00280110,
+ 0x01200010,0x01200110,0x01280010,0x01280110,
+ 0x00000200,0x00000300,0x00080200,0x00080300,
+ 0x01000200,0x01000300,0x01080200,0x01080300,
+ 0x00000210,0x00000310,0x00080210,0x00080310,
+ 0x01000210,0x01000310,0x01080210,0x01080310,
+ 0x00200200,0x00200300,0x00280200,0x00280300,
+ 0x01200200,0x01200300,0x01280200,0x01280300,
+ 0x00200210,0x00200310,0x00280210,0x00280310,
+ 0x01200210,0x01200310,0x01280210,0x01280310 },
+ /* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
+ { 0x00000000,0x04000000,0x00040000,0x04040000,
+ 0x00000002,0x04000002,0x00040002,0x04040002,
+ 0x00002000,0x04002000,0x00042000,0x04042000,
+ 0x00002002,0x04002002,0x00042002,0x04042002,
+ 0x00000020,0x04000020,0x00040020,0x04040020,
+ 0x00000022,0x04000022,0x00040022,0x04040022,
+ 0x00002020,0x04002020,0x00042020,0x04042020,
+ 0x00002022,0x04002022,0x00042022,0x04042022,
+ 0x00000800,0x04000800,0x00040800,0x04040800,
+ 0x00000802,0x04000802,0x00040802,0x04040802,
+ 0x00002800,0x04002800,0x00042800,0x04042800,
+ 0x00002802,0x04002802,0x00042802,0x04042802,
+ 0x00000820,0x04000820,0x00040820,0x04040820,
+ 0x00000822,0x04000822,0x00040822,0x04040822,
+ 0x00002820,0x04002820,0x00042820,0x04042820,
+ 0x00002822,0x04002822,0x00042822,0x04042822 }
+};
+
+
+static CARD32 SPtrans[8][64] = {
+ /* nibble 0 */
+ { 0x00410100, 0x00010000, 0x40400000, 0x40410100,
+ 0x00400000, 0x40010100, 0x40010000, 0x40400000,
+ 0x40010100, 0x00410100, 0x00410000, 0x40000100,
+ 0x40400100, 0x00400000, 0x00000000, 0x40010000,
+ 0x00010000, 0x40000000, 0x00400100, 0x00010100,
+ 0x40410100, 0x00410000, 0x40000100, 0x00400100,
+ 0x40000000, 0x00000100, 0x00010100, 0x40410000,
+ 0x00000100, 0x40400100, 0x40410000, 0x00000000,
+ 0x00000000, 0x40410100, 0x00400100, 0x40010000,
+ 0x00410100, 0x00010000, 0x40000100, 0x00400100,
+ 0x40410000, 0x00000100, 0x00010100, 0x40400000,
+ 0x40010100, 0x40000000, 0x40400000, 0x00410000,
+ 0x40410100, 0x00010100, 0x00410000, 0x40400100,
+ 0x00400000, 0x40000100, 0x40010000, 0x00000000,
+ 0x00010000, 0x00400000, 0x40400100, 0x00410100,
+ 0x40000000, 0x40410000, 0x00000100, 0x40010100 },
+
+ /* nibble 1 */
+ { 0x08021002, 0x00000000, 0x00021000, 0x08020000,
+ 0x08000002, 0x00001002, 0x08001000, 0x00021000,
+ 0x00001000, 0x08020002, 0x00000002, 0x08001000,
+ 0x00020002, 0x08021000, 0x08020000, 0x00000002,
+ 0x00020000, 0x08001002, 0x08020002, 0x00001000,
+ 0x00021002, 0x08000000, 0x00000000, 0x00020002,
+ 0x08001002, 0x00021002, 0x08021000, 0x08000002,
+ 0x08000000, 0x00020000, 0x00001002, 0x08021002,
+ 0x00020002, 0x08021000, 0x08001000, 0x00021002,
+ 0x08021002, 0x00020002, 0x08000002, 0x00000000,
+ 0x08000000, 0x00001002, 0x00020000, 0x08020002,
+ 0x00001000, 0x08000000, 0x00021002, 0x08001002,
+ 0x08021000, 0x00001000, 0x00000000, 0x08000002,
+ 0x00000002, 0x08021002, 0x00021000, 0x08020000,
+ 0x08020002, 0x00020000, 0x00001002, 0x08001000,
+ 0x08001002, 0x00000002, 0x08020000, 0x00021000 },
+
+ /* nibble 2 */
+ { 0x20800000, 0x00808020, 0x00000020, 0x20800020,
+ 0x20008000, 0x00800000, 0x20800020, 0x00008020,
+ 0x00800020, 0x00008000, 0x00808000, 0x20000000,
+ 0x20808020, 0x20000020, 0x20000000, 0x20808000,
+ 0x00000000, 0x20008000, 0x00808020, 0x00000020,
+ 0x20000020, 0x20808020, 0x00008000, 0x20800000,
+ 0x20808000, 0x00800020, 0x20008020, 0x00808000,
+ 0x00008020, 0x00000000, 0x00800000, 0x20008020,
+ 0x00808020, 0x00000020, 0x20000000, 0x00008000,
+ 0x20000020, 0x20008000, 0x00808000, 0x20800020,
+ 0x00000000, 0x00808020, 0x00008020, 0x20808000,
+ 0x20008000, 0x00800000, 0x20808020, 0x20000000,
+ 0x20008020, 0x20800000, 0x00800000, 0x20808020,
+ 0x00008000, 0x00800020, 0x20800020, 0x00008020,
+ 0x00800020, 0x00000000, 0x20808000, 0x20000020,
+ 0x20800000, 0x20008020, 0x00000020, 0x00808000 },
+
+ /* nibble 3 */
+ { 0x00080201, 0x02000200, 0x00000001, 0x02080201,
+ 0x00000000, 0x02080000, 0x02000201, 0x00080001,
+ 0x02080200, 0x02000001, 0x02000000, 0x00000201,
+ 0x02000001, 0x00080201, 0x00080000, 0x02000000,
+ 0x02080001, 0x00080200, 0x00000200, 0x00000001,
+ 0x00080200, 0x02000201, 0x02080000, 0x00000200,
+ 0x00000201, 0x00000000, 0x00080001, 0x02080200,
+ 0x02000200, 0x02080001, 0x02080201, 0x00080000,
+ 0x02080001, 0x00000201, 0x00080000, 0x02000001,
+ 0x00080200, 0x02000200, 0x00000001, 0x02080000,
+ 0x02000201, 0x00000000, 0x00000200, 0x00080001,
+ 0x00000000, 0x02080001, 0x02080200, 0x00000200,
+ 0x02000000, 0x02080201, 0x00080201, 0x00080000,
+ 0x02080201, 0x00000001, 0x02000200, 0x00080201,
+ 0x00080001, 0x00080200, 0x02080000, 0x02000201,
+ 0x00000201, 0x02000000, 0x02000001, 0x02080200 },
+
+ /* nibble 4 */
+ { 0x01000000, 0x00002000, 0x00000080, 0x01002084,
+ 0x01002004, 0x01000080, 0x00002084, 0x01002000,
+ 0x00002000, 0x00000004, 0x01000004, 0x00002080,
+ 0x01000084, 0x01002004, 0x01002080, 0x00000000,
+ 0x00002080, 0x01000000, 0x00002004, 0x00000084,
+ 0x01000080, 0x00002084, 0x00000000, 0x01000004,
+ 0x00000004, 0x01000084, 0x01002084, 0x00002004,
+ 0x01002000, 0x00000080, 0x00000084, 0x01002080,
+ 0x01002080, 0x01000084, 0x00002004, 0x01002000,
+ 0x00002000, 0x00000004, 0x01000004, 0x01000080,
+ 0x01000000, 0x00002080, 0x01002084, 0x00000000,
+ 0x00002084, 0x01000000, 0x00000080, 0x00002004,
+ 0x01000084, 0x00000080, 0x00000000, 0x01002084,
+ 0x01002004, 0x01002080, 0x00000084, 0x00002000,
+ 0x00002080, 0x01002004, 0x01000080, 0x00000084,
+ 0x00000004, 0x00002084, 0x01002000, 0x01000004 },
+
+ /* nibble 5 */
+ { 0x10000008, 0x00040008, 0x00000000, 0x10040400,
+ 0x00040008, 0x00000400, 0x10000408, 0x00040000,
+ 0x00000408, 0x10040408, 0x00040400, 0x10000000,
+ 0x10000400, 0x10000008, 0x10040000, 0x00040408,
+ 0x00040000, 0x10000408, 0x10040008, 0x00000000,
+ 0x00000400, 0x00000008, 0x10040400, 0x10040008,
+ 0x10040408, 0x10040000, 0x10000000, 0x00000408,
+ 0x00000008, 0x00040400, 0x00040408, 0x10000400,
+ 0x00000408, 0x10000000, 0x10000400, 0x00040408,
+ 0x10040400, 0x00040008, 0x00000000, 0x10000400,
+ 0x10000000, 0x00000400, 0x10040008, 0x00040000,
+ 0x00040008, 0x10040408, 0x00040400, 0x00000008,
+ 0x10040408, 0x00040400, 0x00040000, 0x10000408,
+ 0x10000008, 0x10040000, 0x00040408, 0x00000000,
+ 0x00000400, 0x10000008, 0x10000408, 0x10040400,
+ 0x10040000, 0x00000408, 0x00000008, 0x10040008 },
+
+ /* nibble 6 */
+ { 0x00000800, 0x00000040, 0x00200040, 0x80200000,
+ 0x80200840, 0x80000800, 0x00000840, 0x00000000,
+ 0x00200000, 0x80200040, 0x80000040, 0x00200800,
+ 0x80000000, 0x00200840, 0x00200800, 0x80000040,
+ 0x80200040, 0x00000800, 0x80000800, 0x80200840,
+ 0x00000000, 0x00200040, 0x80200000, 0x00000840,
+ 0x80200800, 0x80000840, 0x00200840, 0x80000000,
+ 0x80000840, 0x80200800, 0x00000040, 0x00200000,
+ 0x80000840, 0x00200800, 0x80200800, 0x80000040,
+ 0x00000800, 0x00000040, 0x00200000, 0x80200800,
+ 0x80200040, 0x80000840, 0x00000840, 0x00000000,
+ 0x00000040, 0x80200000, 0x80000000, 0x00200040,
+ 0x00000000, 0x80200040, 0x00200040, 0x00000840,
+ 0x80000040, 0x00000800, 0x80200840, 0x00200000,
+ 0x00200840, 0x80000000, 0x80000800, 0x80200840,
+ 0x80200000, 0x00200840, 0x00200800, 0x80000800 },
+
+ /* nibble 7 */
+ { 0x04100010, 0x04104000, 0x00004010, 0x00000000,
+ 0x04004000, 0x00100010, 0x04100000, 0x04104010,
+ 0x00000010, 0x04000000, 0x00104000, 0x00004010,
+ 0x00104010, 0x04004010, 0x04000010, 0x04100000,
+ 0x00004000, 0x00104010, 0x00100010, 0x04004000,
+ 0x04104010, 0x04000010, 0x00000000, 0x00104000,
+ 0x04000000, 0x00100000, 0x04004010, 0x04100010,
+ 0x00100000, 0x00004000, 0x04104000, 0x00000010,
+ 0x00100000, 0x00004000, 0x04000010, 0x04104010,
+ 0x00004010, 0x04000000, 0x00000000, 0x00104000,
+ 0x04100010, 0x04004010, 0x04004000, 0x00100010,
+ 0x04104000, 0x00000010, 0x00100010, 0x04004000,
+ 0x04104010, 0x00100000, 0x04100000, 0x04000010,
+ 0x00104000, 0x00004010, 0x04004010, 0x04100000,
+ 0x00000010, 0x04104000, 0x00104010, 0x00000000,
+ 0x04000000, 0x04100010, 0x00004000, 0x00104010}
+};
+
+#define ITERATIONS 16
+#define HALF_ITERATIONS 8
+
+#define c2l(c,l) (l =((CARD32)(*((c)++))) , \
+ l|=((CARD32)(*((c)++)))<< 8, \
+ l|=((CARD32)(*((c)++)))<<16, \
+ l|=((CARD32)(*((c)++)))<<24)
+
+#define l2c(l,c) (*((c)++)=(CARD8)(((l) )&0xff), \
+ *((c)++)=(CARD8)(((l)>> 8)&0xff), \
+ *((c)++)=(CARD8)(((l)>>16)&0xff), \
+ *((c)++)=(CARD8)(((l)>>24)&0xff))
+
+#define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
+ (b)^=(t),\
+ (a)^=((t)<<(n)))
+
+#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
+ (a)=(a)^(t)^(t>>(16-(n))))\
+
+static char shifts2[16] = {0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
+
+void _XdmcpAuthSetup(auth_cblock key, auth_wrapper_schedule schedule)
+{
+ CARD32 c,d,t,s;
+ CARD8 *in;
+ CARD32 *k;
+ int i;
+
+ k=(CARD32 *)schedule;
+ in=(CARD8 *)key;
+
+ c2l(in,c);
+ c2l(in,d);
+
+ /* do PC1 in 60 simple operations */
+ PERM_OP(d,c,t,4,0x0f0f0f0f);
+ HPERM_OP(c,t,-2, 0xcccc0000);
+ HPERM_OP(c,t,-1, 0xaaaa0000);
+ HPERM_OP(c,t, 8, 0x00ff0000);
+ HPERM_OP(c,t,-1, 0xaaaa0000);
+ HPERM_OP(d,t,-8, 0xff000000);
+ HPERM_OP(d,t, 8, 0x00ff0000);
+ HPERM_OP(d,t, 2, 0x33330000);
+ d=((d&0x00aa00aa)<<7)|((d&0x55005500)>>7)|(d&0xaa55aa55);
+ d=(d>>8)|((c&0xf0000000)>>4);
+ c&=0x0fffffff;
+
+ for (i=0; i<ITERATIONS; i++) {
+ if (shifts2[i]) {
+ c=((c>>2)|(c<<26)); d=((d>>2)|(d<<26));
+ } else {
+ c=((c>>1)|(c<<27)); d=((d>>1)|(d<<27));
+ }
+ c&=0x0fffffff;
+ d&=0x0fffffff;
+ /* could be a few less shifts but I am to lazy at this
+ * point in time to investigate */
+ s= skb[0][ (c )&0x3f ]|
+ skb[1][((c>> 6)&0x03)|((c>> 7)&0x3c)]|
+ skb[2][((c>>13)&0x0f)|((c>>14)&0x30)]|
+ skb[3][((c>>20)&0x01)|((c>>21)&0x06) |
+ ((c>>22)&0x38)];
+ t= skb[4][ (d )&0x3f ]|
+ skb[5][((d>> 7)&0x03)|((d>> 8)&0x3c)]|
+ skb[6][ (d>>15)&0x3f ]|
+ skb[7][((d>>21)&0x0f)|((d>>22)&0x30)];
+
+ /* table contained 0213 4657 */
+ *(k++)=((t<<16)|(s&0x0000ffff));
+ s= ((s>>16)|(t&0xffff0000));
+
+ s=(s<<4)|(s>>28);
+ *(k++)=s;
+ }
+ return;
+}
+
+#define D_ENCRYPT(L,R,S) \
+ t=(R<<1)|(R>>31); \
+ u=(t^s[S ]); \
+ t=(t^s[S+1]); \
+ t=(t>>4)|(t<<28); \
+ L^= SPtrans[1][(t )&0x3f]| \
+ SPtrans[3][(t>> 8)&0x3f]| \
+ SPtrans[5][(t>>16)&0x3f]| \
+ SPtrans[7][(t>>24)&0x3f]| \
+ SPtrans[0][(u )&0x3f]| \
+ SPtrans[2][(u>> 8)&0x3f]| \
+ SPtrans[4][(u>>16)&0x3f]| \
+ SPtrans[6][(u>>24)&0x3f];
+
+
+void _XdmcpAuthDoIt(auth_cblock input, auth_cblock output,
+ auth_wrapper_schedule ks, int encrypt)
+{
+ CARD32 l,r,t,u;
+ CARD32 *s;
+ CARD8 *in,*out;
+ int i;
+
+ in=(CARD8 *)input;
+ out=(CARD8 *)output;
+ c2l(in,l);
+ c2l(in,r);
+
+ /* do IP */
+ PERM_OP(r,l,t, 4,0x0f0f0f0f);
+ PERM_OP(l,r,t,16,0x0000ffff);
+ PERM_OP(r,l,t, 2,0x33333333);
+ PERM_OP(l,r,t, 8,0x00ff00ff);
+ PERM_OP(r,l,t, 1,0x55555555);
+ /* r and l are reversed - remember that :-) */
+ t=l;
+ l=r;
+ r=t;
+
+ s=(CARD32 *)ks;
+
+ if (encrypt) {
+ for (i=0; i<(ITERATIONS*2); i+=4) {
+ D_ENCRYPT(l,r, i); /* 1 */
+ D_ENCRYPT(r,l, i+2); /* 2 */
+ }
+ } else {
+ for (i=(ITERATIONS*2)-2; i >= 0; i-=4) {
+ D_ENCRYPT(l,r, i); /* 1 */
+ D_ENCRYPT(r,l, i-2); /* 2 */
+ }
+ }
+
+ /* swap l and r
+ * we will not do the swap so just remember they are
+ * reversed for the rest of the subroutine
+ * luckily by FP fixes this problem :-) */
+
+ PERM_OP(r,l,t, 1,0x55555555);
+ PERM_OP(l,r,t, 8,0x00ff00ff);
+ PERM_OP(r,l,t, 2,0x33333333);
+ PERM_OP(l,r,t,16,0x0000ffff);
+ PERM_OP(r,l,t, 4,0x0f0f0f0f);
+
+ l2c(l,out);
+ l2c(r,out);
+ return;
+}
diff --git a/include/X11/Xdmcp.h b/include/X11/Xdmcp.h
index db339fc..2548485 100644
--- a/include/X11/Xdmcp.h
+++ b/include/X11/Xdmcp.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/Xdmcp/Xdmcp.h,v 1.1.4.3.4.1 2004/03/04 17:46:53 eich Exp $ */
+/* $XdotOrg: xc/lib/Xdmcp/Xdmcp.h,v 1.2 2004/04/23 18:43:41 eich Exp $ */
/* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */
/*
* Copyright 1989 Network Computing Devices, Inc., Mountain View, California.