svn commit: samba r9336 - in trunk/source: . lib libsmb

[jra at samba.org]

Author: jra
Date: 2005-08-17 01:16:47 +0000 (Wed, 17 Aug 2005)
New Revision: 9336

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=9336

Log:
Move arc4 into a separate file and add it to the makefile to 
fix dependencies.
Jeremy.

Added:
   trunk/source/lib/arc4.c
Modified:
   trunk/source/Makefile.in
   trunk/source/libsmb/smbdes.c


Changeset:
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in	2005-08-16 23:19:17 UTC (rev 9335)
+++ trunk/source/Makefile.in	2005-08-17 01:16:47 UTC (rev 9336)
@@ -199,7 +199,7 @@
 	  lib/talloc.o lib/substitute.o lib/fsusage.o \
 	  lib/ms_fnmatch.o lib/select.o lib/messages.o \
 	  lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
-	  lib/md5.o lib/hmacmd5.o lib/iconv.o \
+	  lib/md5.o lib/hmacmd5.o lib/arc4.o lib/iconv.o \
 	  nsswitch/wb_client.o $(WBCOMMON_OBJ) \
 	  lib/pam_errors.o intl/lang_tdb.o \
 	  lib/adt_tree.o lib/gencache.o $(TDB_OBJ) \

Added: trunk/source/lib/arc4.c
===================================================================
--- trunk/source/lib/arc4.c	2005-08-16 23:19:17 UTC (rev 9335)
+++ trunk/source/lib/arc4.c	2005-08-17 01:16:47 UTC (rev 9336)
@@ -0,0 +1,80 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   An implementation of arc4.
+
+   Copyright (C) Jeremy Allison 2005.
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+/*****************************************************************
+ Initialize state for an arc4 crypt/decrpyt.
+ arc4 state is 258 bytes - last 2 bytes are the index bytes.
+*****************************************************************/
+
+void smb_arc4_init(unsigned char arc4_state_out[258], const unsigned char *key, size_t keylen)
+{
+	size_t ind;
+	unsigned char j = 0;
+
+	for (ind = 0; ind < 256; ind++) {
+		arc4_state_out[ind] = (unsigned char)ind;
+	}
+
+	for( ind = 0; ind < 256; ind++) {
+		unsigned char tc;
+
+		j += (arc4_state_out[ind] + key[ind%keylen]);
+
+		tc = arc4_state_out[ind];
+		arc4_state_out[ind] = arc4_state_out[j];
+		arc4_state_out[j] = tc;
+	}
+	arc4_state_out[256] = 0;
+	arc4_state_out[257] = 0;
+}
+
+/*****************************************************************
+ Do the arc4 crypt/decrpyt.
+ arc4 state is 258 bytes - last 2 bytes are the index bytes.
+*****************************************************************/
+
+void smb_arc4_crypt(unsigned char arc4_state_inout[258], unsigned char *data, size_t len)
+{
+	unsigned char index_i = arc4_state_inout[256];
+	unsigned char index_j = arc4_state_inout[257];
+        size_t ind;
+
+	for( ind = 0; ind < len; ind++) {
+		unsigned char tc;
+		unsigned char t;
+
+		index_i++;
+		index_j += arc4_state_inout[index_i];
+
+		tc = arc4_state_inout[index_i];
+		arc4_state_inout[index_i] = arc4_state_inout[index_j];
+		arc4_state_inout[index_j] = tc;
+
+		t = arc4_state_inout[index_i] + arc4_state_inout[index_j];
+		data[ind] = data[ind] ^ arc4_state_inout[t];
+	}
+
+	arc4_state_inout[256] = index_i;
+	arc4_state_inout[257] = index_j;
+}

Modified: trunk/source/libsmb/smbdes.c
===================================================================
--- trunk/source/libsmb/smbdes.c	2005-08-16 23:19:17 UTC (rev 9335)
+++ trunk/source/libsmb/smbdes.c	2005-08-17 01:16:47 UTC (rev 9336)
@@ -358,63 +358,6 @@
 }
 
 /*****************************************************************
- Initialize state for an arc4 crypt/decrpyt.
- arc4 state is 258 bytes - last 2 bytes are the index bytes.
-*****************************************************************/
-
-void smb_arc4_init(unsigned char arc4_state_out[258], const unsigned char *key, size_t keylen)
-{
-	size_t ind;
-	unsigned char j = 0;
-
-	for (ind = 0; ind < 256; ind++) {
-		arc4_state_out[ind] = (unsigned char)ind;
-	}
-
-	for( ind = 0; ind < 256; ind++) {
-		unsigned char tc;
-
-		j += (arc4_state_out[ind] + key[ind%keylen]);
-
-		tc = arc4_state_out[ind];
-		arc4_state_out[ind] = arc4_state_out[j];
-		arc4_state_out[j] = tc;
-	}
-	arc4_state_out[256] = 0;
-	arc4_state_out[257] = 0;
-}
-
-/*****************************************************************
- Do the arc4 crypt/decrpyt.
- arc4 state is 258 bytes - last 2 bytes are the index bytes.
-*****************************************************************/
-
-void smb_arc4_crypt(unsigned char arc4_state_inout[258], unsigned char *data, size_t len)
-{
-	unsigned char index_i = arc4_state_inout[256];
-	unsigned char index_j = arc4_state_inout[257];
-        size_t ind;
-
-	for( ind = 0; ind < len; ind++) {
-		unsigned char tc;
-		unsigned char t;
-
-		index_i++;
-		index_j += arc4_state_inout[index_i];
-
-		tc = arc4_state_inout[index_i];
-		arc4_state_inout[index_i] = arc4_state_inout[index_j];
-		arc4_state_inout[index_j] = tc;
-
-		t = arc4_state_inout[index_i] + arc4_state_inout[index_j];
-		data[ind] = data[ind] ^ arc4_state_inout[t];
-	}
-
-	arc4_state_inout[256] = index_i;
-	arc4_state_inout[257] = index_j;
-}
-
-/*****************************************************************
  arc4 crypt/decrypt with a 16 byte key.
 *****************************************************************/