mirror of
https://github.com/samba-team/samba.git
synced 2025-03-08 04:58:40 +03:00
fixed a bug in the base64 hanlding that led to auth failures for some
passwords with SWAT (This used to be commit edcde70108ab643a29f3e0e0cc97609287da6e87)
This commit is contained in:
parent
a5f8955ccb
commit
296038d498
@ -431,11 +431,11 @@ decode a base64 string in-place - simple and slow algorithm
|
||||
static void base64_decode(char *s)
|
||||
{
|
||||
char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
int bit_offset, byte_offset, idx, i;
|
||||
int bit_offset, byte_offset, idx, i, n;
|
||||
unsigned char *d = (unsigned char *)s;
|
||||
char *p;
|
||||
|
||||
i=0;
|
||||
n=i=0;
|
||||
|
||||
while (*s && (p=strchr(b64,*s))) {
|
||||
idx = (int)(p - b64);
|
||||
@ -444,13 +444,17 @@ static void base64_decode(char *s)
|
||||
d[byte_offset] &= ~((1<<(8-bit_offset))-1);
|
||||
if (bit_offset < 3) {
|
||||
d[byte_offset] |= (idx << (2-bit_offset));
|
||||
n = byte_offset+1;
|
||||
} else {
|
||||
d[byte_offset] |= (idx >> (bit_offset-2));
|
||||
d[byte_offset+1] = 0;
|
||||
d[byte_offset+1] |= (idx << (8-(bit_offset-2))) & 0xFF;
|
||||
n = byte_offset+2;
|
||||
}
|
||||
s++; i++;
|
||||
}
|
||||
/* null terminate */
|
||||
d[n] = 0;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user