summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-09-04 19:47:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:43:24 -0500
commitf8a17bd8bdbb52b200671e7ed52ffd982419f3f6 (patch)
treed1cfcad8ec932b033913ea210c6852fa7ad7e38a /source3/libsmb
parentc49961b785b42aa6ce8ca852f268356b64d50dcc (diff)
downloadsamba-f8a17bd8bdbb52b200671e7ed52ffd982419f3f6.tar.gz
samba-f8a17bd8bdbb52b200671e7ed52ffd982419f3f6.tar.bz2
samba-f8a17bd8bdbb52b200671e7ed52ffd982419f3f6.zip
r18047: More C++ stuff
(This used to be commit 86f4ca84f2df2aa8977eb24828e3aa840dda7201)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/smbdes.c6
1 files changed, 3 insertions, 3 deletions
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];