diff options
| -rw-r--r-- | packet-http.c | 36 | ||||
| -rw-r--r-- | util.c | 35 | ||||
| -rw-r--r-- | util.h | 4 |
3 files changed, 39 insertions, 36 deletions
diff --git a/packet-http.c b/packet-http.c index 62a92f8f29..e9ea23cabf 100644 --- a/packet-http.c +++ b/packet-http.c @@ -6,7 +6,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 1999, Andrew Tridgell <tridge@samba.org> * - * $Id: packet-http.c,v 1.61 2003/02/24 01:17:45 guy Exp $ + * $Id: packet-http.c,v 1.62 2003/05/23 05:25:18 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -38,6 +38,7 @@ #include <epan/packet.h> #include <epan/strutil.h> +#include "util.h" #include "packet-http.h" typedef enum _http_type { @@ -84,39 +85,6 @@ static heur_dissector_list_t heur_subdissector_list; static dissector_handle_t ntlmssp_handle=NULL; -/* Decode a base64 string in-place - simple and slow algorithm. - Return length of result. Taken from rproxy/librsync/base64.c by - Andrew Tridgell. */ - -static size_t base64_decode(char *s) -{ - static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - int bit_offset, byte_offset, idx, i, n; - unsigned char *d = (unsigned char *)s; - char *p; - - n=i=0; - - while (*s && (p=strchr(b64, *s))) { - idx = (int)(p - b64); - byte_offset = (i*6)/8; - bit_offset = (i*6)%8; - 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++; - } - - return n; -} - /* Return a tvb that contains the binary representation of a base64 string */ @@ -1,7 +1,7 @@ /* util.c * Utility routines * - * $Id: util.c,v 1.60 2003/03/12 00:07:32 guy Exp $ + * $Id: util.c,v 1.61 2003/05/23 05:25:18 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -587,3 +587,36 @@ compute_timestamp_diff(gint *diffsec, gint *diffusec, } } } + +/* Decode a base64 string in-place - simple and slow algorithm. + Return length of result. Taken from rproxy/librsync/base64.c by + Andrew Tridgell. */ + +size_t base64_decode(char *s) +{ + static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + int bit_offset, byte_offset, idx, i, n; + unsigned char *d = (unsigned char *)s; + char *p; + + n=i=0; + + while (*s && (p=strchr(b64, *s))) { + idx = (int)(p - b64); + byte_offset = (i*6)/8; + bit_offset = (i*6)%8; + 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++; + } + + return n; +} @@ -1,7 +1,7 @@ /* util.h * Utility definitions * - * $Id: util.h,v 1.28 2003/03/12 00:07:32 guy Exp $ + * $Id: util.h,v 1.29 2003/05/23 05:25:19 tpot Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -56,6 +56,8 @@ guint8 EBCDIC_to_ASCII1(guint8 c); /* Compute the difference between two seconds/microseconds time stamps. */ void compute_timestamp_diff(gint *, gint *, guint32, guint32, guint32, guint32); +/* In-place decoding of a base64 string. */ +size_t base64_decode(char *s); #ifdef __cplusplus } |