From c3e52ea6ca3178b7ecab4b389a9ba9269662b48f Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Wed, 15 Mar 2006 17:05:25 +0000
Subject: Further cleanups to compile with C++ compiler.

svn path=/branches/BRANCH_6-3/; revision=4744
---
 smbdes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'smbdes.c')

diff --git a/smbdes.c b/smbdes.c
index e3ab78af..f738b6a2 100644
--- a/smbdes.c
+++ b/smbdes.c
@@ -173,7 +173,7 @@ static void concat(char *out, char *in1, char *in2, int l1, int l2)
 		*out++ = *in2++;
 }
 
-static void xor(char *out, char *in1, char *in2, int n)
+static void exor(char *out, char *in1, char *in2, int n)
 {
 	int i;
 	for (i=0;i<n;i++)
@@ -224,7 +224,7 @@ static void dohash(char *out, char *in, char *key, int forw)
 
 		permute(er, r, perm4, 48);
 
-		xor(erk, er, ki[forw ? i : 15 - i], 48);
+		exor(erk, er, ki[forw ? i : 15 - i], 48);
 
 		for (j=0;j<8;j++)
 			for (k=0;k<6;k++)
@@ -245,7 +245,7 @@ static void dohash(char *out, char *in, char *key, int forw)
 				cb[j*4+k] = b[j][k];
 		permute(pcb, cb, perm5, 32);
 
-		xor(r2, l, pcb, 32);
+		exor(r2, l, pcb, 32);
 
 		for (j=0;j<32;j++)
 			l[j] = r[j];
-- 
cgit v1.2.3