From f8a17bd8bdbb52b200671e7ed52ffd982419f3f6 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 4 Sep 2006 19:47:48 +0000
Subject: r18047: More C++ stuff (This used to be commit
 86f4ca84f2df2aa8977eb24828e3aa840dda7201)

---
 source3/libsmb/smbdes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source3/libsmb/smbdes.c')

diff --git a/source3/libsmb/smbdes.c b/source3/libsmb/smbdes.c
index ee43f4beee..8168eee207 100644
--- a/source3/libsmb/smbdes.c
+++ b/source3/libsmb/smbdes.c
@@ -172,7 +172,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 x_or(char *out, char *in1, char *in2, int n)
 {
 	int i;
 	for (i=0;i<n;i++)
@@ -223,7 +223,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);
+		x_or(erk, er, ki[forw ? i : 15 - i], 48);
 
 		for (j=0;j<8;j++)
 			for (k=0;k<6;k++)
@@ -244,7 +244,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);
+		x_or(r2, l, pcb, 32);
 
 		for (j=0;j<32;j++)
 			l[j] = r[j];
-- 
cgit