diff -Nur uClinux/linux/net/ipsec/ipsec_rcv.c ../114/uClinux/linux/net/ipsec/ipsec_rcv.c
--- uClinux/linux/net/ipsec/ipsec_rcv.c	2002-08-13 10:59:14.000000000 -0700
+++ uClinux/linux/net/ipsec/ipsec_rcv.c	2002-11-19 15:22:02.000000000 -0800
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-char ipsec_rcv_c_version[] = "RCSID $Id: patch113to114,v 1.4 2002/12/09 18:47:38 prakity Exp $";
+char ipsec_rcv_c_version[] = "RCSID $Id: patch113to114,v 1.4 2002/12/09 18:47:38 prakity Exp $";
 
 #include <linux/config.h>
 #include <linux/version.h>
@@ -965,7 +965,7 @@
 
 					hd[0].ioctl.status    = 0 ;
 					hd[0].ioctl.type      = MSP_SEC_HMAC ;
-					hd[0].ioctl.mode      = HMC_MD5 ;
+					hd[0].ioctl.mode      = HMC_SHA1 ;
 					hd[0].ioctl.options   = MSP_SEC_DO_PADDING;
 					hd[0].ioctl.buflen = tdbp->tdb_key_a_size ;
 					hd[0].ioctl.srcaddr = tdbp->tdb_key_a ;
@@ -1704,6 +1704,15 @@
 
 /*
  * $Log: patch113to114,v $
  * Revision 1.4  2002/12/09 18:47:38  prakity
  *
  * the patch for the cvs export of a file is NOT the same as the patch
  * if we work off the cvs checkout of the tagged directory --
  *
  * Wow ....  Tag names get expanded if a cvs checkout and not a cvs export
  *
+ * Revision 1.2.2.1  2002/11/19 23:22:02  prakity
+ *
+ * Check - In from main trunk.
+ * per steve wahl
+ *
+ * <  * The 'do sha1, not md5, stupid!' comment applies to recieving, also...
+ *
+ * Did not fix receive part -- need to do 1.1.5 tag
+ *
  * Revision 1.2  2002/08/13 17:59:14  swahl
  * use brecis hardware/driver HMAC function
  *
diff -Nur uClinux/README ../114/uClinux/README
--- uClinux/README	2002-11-05 14:13:56.000000000 -0800
+++ uClinux/README	2002-11-21 18:39:17.000000000 -0800
@@ -1,4 +1,4 @@
-BRECIS uClinux Release 1.1.3
+BRECIS uClinux Release 1.1.4
 
 
 INTRODUCTION:
Binary files uClinux/romdisk/romdisk.tgz and ../114/uClinux/romdisk/romdisk.tgz differ
diff -Nur uClinux/uC-src/real/freeswan/freeswan-1.97/klips/net/ipsec/ipsec_rcv.c ../114/uClinux/uC-src/real/freeswan/freeswan-1.97/klips/net/ipsec/ipsec_rcv.c
--- uClinux/uC-src/real/freeswan/freeswan-1.97/klips/net/ipsec/ipsec_rcv.c	2002-08-13 10:59:14.000000000 -0700
+++ uClinux/uC-src/real/freeswan/freeswan-1.97/klips/net/ipsec/ipsec_rcv.c	2002-11-19 15:22:02.000000000 -0800
@@ -14,7 +14,7 @@
  * for more details.
  */
 
-char ipsec_rcv_c_version[] = "RCSID $Id: patch113to114,v 1.4 2002/12/09 18:47:38 prakity Exp $";
+char ipsec_rcv_c_version[] = "RCSID $Id: patch113to114,v 1.4 2002/12/09 18:47:38 prakity Exp $";
 
 #include <linux/config.h>
 #include <linux/version.h>
@@ -965,7 +965,7 @@
 
 					hd[0].ioctl.status    = 0 ;
 					hd[0].ioctl.type      = MSP_SEC_HMAC ;
-					hd[0].ioctl.mode      = HMC_MD5 ;
+					hd[0].ioctl.mode      = HMC_SHA1 ;
 					hd[0].ioctl.options   = MSP_SEC_DO_PADDING;
 					hd[0].ioctl.buflen = tdbp->tdb_key_a_size ;
 					hd[0].ioctl.srcaddr = tdbp->tdb_key_a ;
@@ -1704,6 +1704,15 @@
 
 /*
  * $Log: patch113to114,v $
  * Revision 1.4  2002/12/09 18:47:38  prakity
  *
  * the patch for the cvs export of a file is NOT the same as the patch
  * if we work off the cvs checkout of the tagged directory --
  *
  * Wow ....  Tag names get expanded if a cvs checkout and not a cvs export
  *
+ * Revision 1.2.2.1  2002/11/19 23:22:02  prakity
+ *
+ * Check - In from main trunk.
+ * per steve wahl
+ *
+ * <  * The 'do sha1, not md5, stupid!' comment applies to recieving, also...
+ *
+ * Did not fix receive part -- need to do 1.1.5 tag
+ *
  * Revision 1.2  2002/08/13 17:59:14  swahl
  * use brecis hardware/driver HMAC function
  *
diff -Nur uClinux/utilities/dhcpd/dhcpd.c ../114/uClinux/utilities/dhcpd/dhcpd.c
--- uClinux/utilities/dhcpd/dhcpd.c	2001-10-16 00:08:41.000000000 -0700
+++ uClinux/utilities/dhcpd/dhcpd.c	2001-10-16 00:08:41.000000000 -0700
@@ -48,7 +48,7 @@
 static char copyright[] =
 "Copyright 1995, 1996 The Internet Software Consortium.";
 static char arr [] = "All rights reserved.";
-static char message [] = "Internet Software Consortium DHCPD $Name: TAG_RELEASE_2_5_BETA_TWO $";
+static char message [] = "Internet Software Consortium DHCPD $Name: TAG_RELEASE_2_5_BETA_TWO $";
 
 #include "dhcpd.h"
 
