oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

clean up the decode mess somewhat

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10012 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-05-28 17:33:41 +00:00
parent 90cb53e2c1
commit cb3a6310d4
1 changed files with 90 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
lib/roken/base64.c
View File

@@ -1,23 +1,23 @@
/* /*
* Copyright (c) 1995 - 1999 Kungliga Tekniska H<>gskolan * Copyright (c) 1995-2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* *
* 3. Neither the name of the Institute nor the names of its contributors * 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,108 +39,98 @@ RCSID("$Id$");
#include <string.h> #include <string.h>
#include "base64.h" #include "base64.h"
static char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; static char base64_chars[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
static int pos(char c) static int
pos(char c)
{ {
char *p; char *p;
for(p = base64; *p; p++) for (p = base64_chars; *p; p++)
if(*p == c) if (*p == c)
return p - base64; return p - base64_chars;
return -1; return -1;
} }
int base64_encode(const void *data, int size, char **str) int
base64_encode(const void *data, int size, char **str)
{ {
char *s, *p; char *s, *p;
int i; int i;
int c; int c;
const unsigned char *q; const unsigned char *q;
p = s = (char*)malloc(size*4/3+4); p = s = (char *) malloc(size * 4 / 3 + 4);
if (p == NULL) if (p == NULL)
return -1; return -1;
q = (const unsigned char*)data; q = (const unsigned char *) data;
i=0; i = 0;
for(i = 0; i < size;){ for (i = 0; i < size;) {
c=q[i++]; c = q[i++];
c*=256; c *= 256;
if(i < size) if (i < size)
c+=q[i]; c += q[i];
i++; i++;
c*=256; c *= 256;
if(i < size) if (i < size)
c+=q[i]; c += q[i];
i++; i++;
p[0]=base64[(c&0x00fc0000) >> 18]; p[0] = base64_chars[(c & 0x00fc0000) >> 18];
p[1]=base64[(c&0x0003f000) >> 12]; p[1] = base64_chars[(c & 0x0003f000) >> 12];
p[2]=base64[(c&0x00000fc0) >> 6]; p[2] = base64_chars[(c & 0x00000fc0) >> 6];
p[3]=base64[(c&0x0000003f) >> 0]; p[3] = base64_chars[(c & 0x0000003f) >> 0];
if(i > size) if (i > size)
p[3]='='; p[3] = '=';
if(i > size+1) if (i > size + 1)
p[2]='='; p[2] = '=';
p+=4; p += 4;
} }
*p=0; *p = 0;
*str = s; *str = s;
return strlen(s); return strlen(s);
} }
int base64_decode(const char *str, void *data) #define DECODE_ERROR 0xffffffff
static unsigned int
token_decode(const char *token)
{ {
const char *p; int i;
unsigned char *q; unsigned int val = 0;
int c; int marker = 0;
int x; if (strlen(token) < 4)
int done = 0; return DECODE_ERROR;
q=(unsigned char*)data; for (i = 0; i < 4; i++) {
for(p=str; *p && !done; p+=4){ val *= 64;
x = pos(p[0]); if (token[i] == '=')
if(x >= 0) marker++;
c = x; else if (marker > 0)
else{ return DECODE_ERROR;
done = 3; else
break; val += pos(token[i]);
} }
c*=64; if (marker > 2)
return DECODE_ERROR;
x = pos(p[1]); return (marker << 24) | val;
if(x >= 0) }
c += x;
else int
return -1; base64_decode(const char *str, void *data)
c*=64; {
const char *p;
if(p[2] == '=') unsigned char *q;
done++;
else{ q = data;
x = pos(p[2]); for (p = str; *p && (*p == '=' || strchr(base64_chars, *p)); p += 4) {
if(x >= 0) unsigned int val = token_decode(p);
c += x; unsigned int marker = (val >> 24) & 0xff;
else if (val == DECODE_ERROR)
return -1; return -1;
} *q++ = (val >> 16) & 0xff;
c*=64; if (marker < 2)
*q++ = (val >> 8) & 0xff;
if(p[3] == '=') if (marker < 1)
done++; *q++ = val & 0xff;
else{ }
if(done) return q - (unsigned char *) data;
return -1;
x = pos(p[3]);
if(x >= 0)
c += x;
else
return -1;
}
if(done < 3)
*q++=(c&0x00ff0000)>>16;
if(done < 2)
*q++=(c&0x0000ff00)>>8;
if(done < 1)
*q++=(c&0x000000ff)>>0;
}
return q - (unsigned char*)data;
} }