diff options
author | Michael Mann <mmann78@netscape.net> | 2016-10-31 01:10:56 -0400 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-11-02 04:34:44 +0000 |
commit | 26e883a75c37e18f633e47dcd85e2648ee1f03ae (patch) | |
tree | 802c9fd06f99561f23715a071ca2dc681173a7bd /wsutil | |
parent | 8ba444b8438395efe352da8c66dd64e9449c60bb (diff) | |
download | wireshark-26e883a75c37e18f633e47dcd85e2648ee1f03ae.tar.gz |
Move Base32_encode from packet-fc00.c to wsutil (as ws_base32_decode)
There could be some reuse out of it, so but it with the rest of the
general utilities.
Change-Id: I404c135b933660a82678510b9ca2701985c5632a
Reviewed-on: https://code.wireshark.org/review/18589
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wsutil')
-rw-r--r-- | wsutil/CMakeLists.txt | 1 | ||||
-rw-r--r-- | wsutil/Makefile.am | 2 | ||||
-rw-r--r-- | wsutil/base32.c | 82 | ||||
-rw-r--r-- | wsutil/base32.h | 58 |
4 files changed, 143 insertions, 0 deletions
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 438bc42cbb..8b9cf011d8 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -25,6 +25,7 @@ set(WSUTIL_COMMON_FILES adler32.c aes.c airpdcap_wep.c + base32.c base64.c bitswap.c buffer.c diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index cf5da9f926..a8642d4e10 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -40,6 +40,7 @@ endif libwsutil_nonrepl_INCLUDES = \ adler32.h \ aes.h \ + base32.h \ base64.h \ bits_count_ones.h \ bits_ctz.h \ @@ -118,6 +119,7 @@ libwsutil_la_SOURCES = \ adler32.c \ aes.c \ airpdcap_wep.c \ + base32.c \ base64.c \ bitswap.c \ buffer.c \ diff --git a/wsutil/base32.c b/wsutil/base32.c new file mode 100644 index 0000000000..6bb1b610b1 --- /dev/null +++ b/wsutil/base32.c @@ -0,0 +1,82 @@ +/* base32.c + * Base-32 conversion + * + * 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 <glib.h> + +#include <string.h> +#include "base32.h" + +/* + * Cjdns style base32 encoding + */ + +/** Returned by ws_base32_encode() if the input is not valid base32. */ +#define Base32_BAD_INPUT -1 +/** Returned by ws_base32_encode() if the output buffer is too small. */ +#define Base32_TOO_BIG -2 + +int ws_base32_decode(guint8* output, const guint32 outputLength, + const guint8* in, const guint32 inputLength) +{ + guint32 outIndex = 0; + guint32 inIndex = 0; + guint32 work = 0; + guint32 bits = 0; + static const guint8* kChars = (guint8*) "0123456789bcdfghjklmnpqrstuvwxyz"; + while (inIndex < inputLength) { + work |= ((unsigned) in[inIndex++]) << bits; + bits += 8; + while (bits >= 5) { + if (outIndex >= outputLength) { + return Base32_TOO_BIG; + } + output[outIndex++] = kChars[work & 31]; + bits -= 5; + work >>= 5; + } + } + if (bits) { + if (outIndex >= outputLength) { + return Base32_TOO_BIG; + } + output[outIndex++] = kChars[work & 31]; + } + if (outIndex < outputLength) { + output[outIndex] = '\0'; + } + return outIndex; +} + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 8 + * tab-width: 8 + * indent-tabs-mode: t + * End: + * + * vi: set shiftwidth=8 tabstop=8 noexpandtab: + * :indentSize=8:tabSize=8:noTabs=false: + */ diff --git a/wsutil/base32.h b/wsutil/base32.h new file mode 100644 index 0000000000..626f64361e --- /dev/null +++ b/wsutil/base32.h @@ -0,0 +1,58 @@ +/* base32.h + * Base-32 conversion + * + * 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 __BASE32_H__ +#define __BASE32_H__ + +#include "ws_symbol_export.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/** Returned by base32_decode() if the input is not valid base32. */ +#define Base32_BAD_INPUT -1 +/** Returned by base32_decode() if the output buffer is too small. */ +#define Base32_TOO_BIG -2 + +/* Encoding of a base32 byte array */ +WS_DLL_PUBLIC +int ws_base32_decode(guint8* output, const guint32 outputLength, + const guint8* in, const guint32 inputLength); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __BASE32_H__ */ + +/* + * Editor modelines - https://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ |