osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2016-10-31 01:10:56 -04:00 committed by Anders Broman
parent 8ba444b843
commit 26e883a75c
6 changed files with 146 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/libwsutil0.symbols vendored
View File

@ -169,6 +169,7 @@ libwsutil.so.0 libwsutil0 #MINVER#
ws_add_crash_info@Base 1.10.0
ws_ascii_strnatcasecmp@Base 1.99.1
ws_ascii_strnatcmp@Base 1.99.1
ws_base32_decode@Base 2.3.0
ws_base64_decode_inplace@Base 1.12.0~rc1
ws_buffer_append@Base 1.99.0
ws_buffer_assure_space@Base 1.99.0

47
epan/dissectors/packet-fc00.c
View File

@ -31,6 +31,7 @@
#include <epan/expert.h>
#include <epan/packet.h>
#include <wsutil/base32.h>
/* Prototypes */
/* (Required to prevent [-Wmissing-prototypes] warnings */
@ -86,50 +87,6 @@ static const value_string session_states[] = {
{ 0, NULL }
};
/*
* Cjdns style base32 encoding
*/
/** Returned by Base32_decode() if the input is not valid base32. */
#define Base32_BAD_INPUT -1
/** Returned by Base32_decode() or Base32_encode() if the output buffer is too small. */
#define Base32_TOO_BIG -2
static inline int Base32_encode(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;
}
/* Code to actually dissect the packets */
static int
dissect_cryptoauth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
@ -191,7 +148,7 @@ dissect_cryptoauth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
tvb_memcpy(tvb, raw_key, PUBLIC_KEY_OFF, PUBLIC_KEY_LEN);
Base32_encode((guint8*)encoded_key, 53, raw_key, PUBLIC_KEY_LEN);
ws_base32_decode((guint8*)encoded_key, 53, raw_key, PUBLIC_KEY_LEN);
g_checksum_update(hash, (guchar*)raw_key, PUBLIC_KEY_LEN);
g_checksum_get_digest(hash, ip_buf, &digest_len);

1
wsutil/CMakeLists.txt
View File

@ -25,6 +25,7 @@ set(WSUTIL_COMMON_FILES
adler32.c
aes.c
airpdcap_wep.c
base32.c
base64.c
bitswap.c
buffer.c

2
wsutil/Makefile.am
View File

@ -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 \

82
wsutil/base32.c Normal file
View File

@ -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:
*/

58
wsutil/base32.h Normal file
View File

@ -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:
*/