Merge branch 'legacy_63'

[~andy/fetchmail] / smbdes.c

diff --git a/smbdes.c b/smbdes.c
index e3ab78afed7b8259018bea7d84e2f10f7547051f..f738b6a2925c4fe3e7d822131e2c68b8b2da2b9a 100644 (file)
--- 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];