Upgraded to latest version of DES library

1 files changed, 193 insertions, 101 deletions

diff --git a/kerberosIV/des/ecb_enc.c b/kerberosIV/des/ecb_enc.c
index af1fc96e519..526a615f0ab 100644
--- a/kerberosIV/des/ecb_enc.c
+++ b/kerberosIV/des/ecb_enc.c
@@ -1,111 +1,203 @@
-/*	$Id: ecb_enc.c,v 1.1 1995/12/14 06:52:44 tholo Exp $	*/
+/* lib/des/ecb_enc.c */
+/* Copyright (C) 1995 Eric Young (eay@mincom.oz.au)
+ * All rights reserved.
+ * 
+ * This file is part of an SSL implementation written
+ * by Eric Young (eay@mincom.oz.au).
+ * The implementation was written so as to conform with Netscapes SSL
+ * specification.  This library and applications are
+ * FREE FOR COMMERCIAL AND NON-COMMERCIAL USE
+ * as long as the following conditions are aheared to.
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.  If this code is used in a product,
+ * Eric Young should be given attribution as the author of the parts used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    This product includes software developed by Eric Young (eay@mincom.oz.au)
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
 
-/* Copyright (C) 1993 Eric Young - see README for more details */
 #include "des_locl.h"
 #include "spr.h"
 
-int des_ecb_encrypt(des_cblock (*input), des_cblock (*output), struct des_ks_struct *ks, int encrypt)
-{
-  register u_int32_t l0,l1;
-  register unsigned char *in,*out;
-  u_int32_t ll[2];
-
-  in=(unsigned char *)input;
-  out=(unsigned char *)output;
-  c2l(in,l0);
-  c2l(in,l1);
-  ll[0]=l0;
-  ll[1]=l1;
-  des_encrypt(ll,ll,ks,encrypt);
-  l0=ll[0];
-  l1=ll[1];
-  l2c(l0,out);
-  l2c(l1,out);
-  l0=l1=ll[0]=ll[1]=0;
-  return(0);
-}
-
-int des_encrypt(u_int32_t *input, u_int32_t *output, struct des_ks_struct *ks, int encrypt)
-{
-  register u_int32_t l,r,t,u;
-#ifdef ALT_ECB
-  register unsigned char *des_SP=(unsigned char *)des_SPtrans;
+const char *DES_version="libdes v 3.21 - 95/11/21 - eay";
+
+void des_ecb_encrypt(input, output, ks, encrypt)
+des_cblock (*input);
+des_cblock (*output);
+des_key_schedule ks;
+int encrypt;
+	{
+	register unsigned long l0,l1;
+	register unsigned char *in,*out;
+	unsigned long ll[2];
+
+	in=(unsigned char *)input;
+	out=(unsigned char *)output;
+	c2l(in,l0); ll[0]=l0;
+	c2l(in,l1); ll[1]=l1;
+	des_encrypt(ll,ks,encrypt);
+	l0=ll[0]; l2c(l0,out);
+	l1=ll[1]; l2c(l1,out);
+	l0=l1=ll[0]=ll[1]=0;
+	}
+
+void des_encrypt(data, ks, encrypt)
+unsigned long *data;
+des_key_schedule ks;
+int encrypt;
+	{
+	register unsigned long l,r,t,u;
+#ifdef DES_USE_PTR
+	register unsigned char *des_SP=(unsigned char *)des_SPtrans;
 #endif
 #ifdef MSDOS
-  union fudge {
-    u_int32_t  l;
-    unsigned short s[2];
-    unsigned char  c[4];
-  } U,T;
+	union fudge {
+		unsigned long  l;
+		unsigned short s[2];
+		unsigned char  c[4];
+		} U,T;
 #endif
-  register int i;
-  register u_int32_t *s;
-
-  l=input[0];
-  r=input[1];
-
-  /* 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 :-) - fix
-   * it in the next step */
-
-  /* Things have been modified so that the initial rotate is
-   * done outside the loop.  This required the
-   * des_SPtrans values in sp.h to be rotated 1 bit to the right.
-   * One perl script later and things have a 5% speed up on a sparc2.
-   * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
-   * for pointing this out. */
-  t=(r<<1)|(r>>31);
-  r=(l<<1)|(l>>31);
-  l=t;
-
-  /* clear the top bits on machines with 8byte longs */
-  l&=0xffffffff;
-  r&=0xffffffff;
-
-  s=(u_int32_t *)ks;
-  /* I don't know if it is worth the effort of loop unrolling the
-   * inner loop */
-  if (encrypt)
-    {
-      for (i=0; i<32; i+=4)
-	{
-	  D_ENCRYPT(l,r,i+0);	/*  1 */
-	  D_ENCRYPT(r,l,i+2);	/*  2 */
+	register int i;
+	register unsigned long *s;
+
+	u=data[0];
+	r=data[1];
+
+	IP(u,r);
+	/* Things have been modified so that the initial rotate is
+	 * done outside the loop.  This required the
+	 * des_SPtrans values in sp.h to be rotated 1 bit to the right.
+	 * One perl script later and things have a 5% speed up on a sparc2.
+	 * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
+	 * for pointing this out. */
+	l=(r<<1)|(r>>31);
+	r=(u<<1)|(u>>31);
+
+	/* clear the top bits on machines with 8byte longs */
+	l&=0xffffffffL;
+	r&=0xffffffffL;
+
+	s=(unsigned long *)ks;
+	/* I don't know if it is worth the effort of loop unrolling the
+	 * inner loop */
+	if (encrypt)
+		{
+		for (i=0; i<32; i+=4)
+			{
+			D_ENCRYPT(l,r,i+0); /*  1 */
+			D_ENCRYPT(r,l,i+2); /*  2 */
+			}
+		}
+	else
+		{
+		for (i=30; i>0; i-=4)
+			{
+			D_ENCRYPT(l,r,i-0); /* 16 */
+			D_ENCRYPT(r,l,i-2); /* 15 */
+			}
+		}
+	l=(l>>1)|(l<<31);
+	r=(r>>1)|(r<<31);
+	/* clear the top bits on machines with 8byte longs */
+	l&=0xffffffffL;
+	r&=0xffffffffL;
+
+	FP(r,l);
+	data[0]=l;
+	data[1]=r;
+	l=r=t=u=0;
 	}
-    }
-  else
-    {
-      for (i=30; i>0; i-=4)
+
+void des_encrypt2(data, ks, encrypt)
+unsigned long *data;
+des_key_schedule ks;
+int encrypt;
 	{
-	  D_ENCRYPT(l,r,i-0);	/* 16 */
-	  D_ENCRYPT(r,l,i-2);	/* 15 */
-	}
-    }
-  l=(l>>1)|(l<<31);
-  r=(r>>1)|(r<<31);
-  /* clear the top bits on machines with 8byte longs */
-  l&=0xffffffff;
-  r&=0xffffffff;
-
-  /* swap l and r
-   * we will not do the swap so just remember they are
-   * reversed for the rest of the subroutine
-   * luckily 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);
-
-  output[0]=l;
-  output[1]=r;
-  l=r=t=u=0;
-  return(0);
-}
+	register unsigned long l,r,t,u;
+#ifdef DES_USE_PTR
+	register unsigned char *des_SP=(unsigned char *)des_SPtrans;
+#endif
+#ifdef MSDOS
+	union fudge {
+		unsigned long  l;
+		unsigned short s[2];
+		unsigned char  c[4];
+		} U,T;
+#endif
+	register int i;
+	register unsigned long *s;
 
+	u=data[0];
+	r=data[1];
+
+	/* Things have been modified so that the initial rotate is
+	 * done outside the loop.  This required the
+	 * des_SPtrans values in sp.h to be rotated 1 bit to the right.
+	 * One perl script later and things have a 5% speed up on a sparc2.
+	 * Thanks to Richard Outerbridge <71755.204@CompuServe.COM>
+	 * for pointing this out. */
+	l=(r<<1)|(r>>31);
+	r=(u<<1)|(u>>31);
+
+	/* clear the top bits on machines with 8byte longs */
+	l&=0xffffffffL;
+	r&=0xffffffffL;
+
+	s=(unsigned long *)ks;
+	/* I don't know if it is worth the effort of loop unrolling the
+	 * inner loop */
+	if (encrypt)
+		{
+		for (i=0; i<32; i+=4)
+			{
+			D_ENCRYPT(l,r,i+0); /*  1 */
+			D_ENCRYPT(r,l,i+2); /*  2 */
+			}
+		}
+	else
+		{
+		for (i=30; i>0; i-=4)
+			{
+			D_ENCRYPT(l,r,i-0); /* 16 */
+			D_ENCRYPT(r,l,i-2); /* 15 */
+			}
+		}
+	l=(l>>1)|(l<<31);
+	r=(r>>1)|(r<<31);
+	/* clear the top bits on machines with 8byte longs */
+	l&=0xffffffffL;
+	r&=0xffffffffL;
+
+	data[0]=l;
+	data[1]=r;
+	l=r=t=u=0;
+	}