diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-21 14:38:51 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-12-21 14:38:51 +0000 |
commit | be733f30414ceb85304396d30b9648b6afe283e5 (patch) | |
tree | 1c451580b0bea8d8c2d1350e4cad0e064f693dbb /wsutil | |
parent | 576c7eae45be250478b5317bacfa19ad46f812de (diff) |
Move epan/base64.[ch] to wsutil/ with function name change.
svn path=/trunk/; revision=54326
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
-rw-r--r-- | wsutil/Makefile.common | 4 | ||||
-rw-r--r-- | wsutil/base64.c | 67 | ||||
-rw-r--r-- | wsutil/base64.h | 41 |
4 files changed, 112 insertions, 1 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 9ad86e8247..b14c236238 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -39,6 +39,7 @@ set(WSUTIL_FILES adler32.c aes.c airpdcap_wep.c + base64.c bitswap.c crash_info.c crc10.c diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 1ed4f22ed3..96b5a7cfa3 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -32,7 +32,8 @@ LIBWSUTIL_SRC = \ adler32.c \ aes.c \ airpdcap_wep.c \ - bitswap.c \ + base64.c \ + bitswap.c \ crash_info.c \ crc6.c \ crc7.c \ @@ -66,6 +67,7 @@ LIBWSUTIL_SRC = \ LIBWSUTIL_INCLUDES = \ adler32.h \ aes.h \ + base64.h \ bits_ctz.h \ bits_count_ones.h \ bitswap.h \ diff --git a/wsutil/base64.c b/wsutil/base64.c new file mode 100644 index 0000000000..2211cff522 --- /dev/null +++ b/wsutil/base64.c @@ -0,0 +1,67 @@ +/* base64.c + * Base-64 conversion + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <string.h> +#include "base64.h" + +/* 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 ws_base64_decode_inplace(char *s) +{ + static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/\r\n"; + int bit_offset, byte_offset, idx, i; + unsigned char *d = (unsigned char *)s; + char *p; + int cr_idx; + + /* we will allow CR and LF - but ignore them */ + cr_idx = (int) (strchr(b64, '\r') - b64); + + i=0; + + while (*s && (p=strchr(b64, *s))) { + idx = (int)(p - b64); + if(idx < cr_idx) { + 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)); + } else { + d[byte_offset] |= (idx >> (bit_offset-2)); + d[byte_offset+1] = 0; + d[byte_offset+1] |= (idx << (8-(bit_offset-2))) & 0xFF; + } + i++; + } + s++; + } + + d[i*3/4] = 0; + return i*3/4; +} diff --git a/wsutil/base64.h b/wsutil/base64.h new file mode 100644 index 0000000000..e9bc51758d --- /dev/null +++ b/wsutil/base64.h @@ -0,0 +1,41 @@ +/* base64.h + * Base-64 conversion + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#ifndef __BASE64_H__ +#define __BASE64_H__ + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* In-place decoding of a base64 string. Resulting string is NULL terminated */ +WS_DLL_PUBLIC +size_t ws_base64_decode_inplace(char *s); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __BASE64_H__ */ |