summaryrefslogtreecommitdiff
path: root/epan/strutil.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2003-12-29 04:07:06 +0000
committerGerald Combs <gerald@wireshark.org>2003-12-29 04:07:06 +0000
commitd72750578bd90389586b901055b1aee07b2a96bf (patch)
tree821eac650eb552d5d8b552f9877e5c3d74ae989a /epan/strutil.h
parent930410872fa5ddb1ac63e0014e3da17376d72c29 (diff)
downloadwireshark-d72750578bd90389586b901055b1aee07b2a96bf.tar.gz
Pull most of bytes_from_unparsed() into a new routine,
hex_str_to_bytes(). Use the new routine to initialize any WEP keys we have defined. This has the side effect of fixing an overflow if the user entered a long WEP key. svn path=/trunk/; revision=9471
Diffstat (limited to 'epan/strutil.h')
-rw-r--r--epan/strutil.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/strutil.h b/epan/strutil.h
index e9792c6e94..fd82d01174 100644
--- a/epan/strutil.h
+++ b/epan/strutil.h
@@ -1,7 +1,7 @@
/* strutil.h
* String utility definitions
*
- * $Id: strutil.h,v 1.11 2003/08/27 15:23:02 gram Exp $
+ * $Id: strutil.h,v 1.12 2003/12/29 04:06:09 gerald Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -34,6 +34,7 @@ int get_token_len(const guchar *linep, const guchar *lineend,
gchar* format_text(const guchar *line, int len);
gchar* bytes_to_str(const guint8 *, int);
gchar* bytes_to_str_punct(const guint8 *, int, gchar punct);
+gboolean hex_str_to_bytes(const guchar *hex_str, const GByteArray *bytes);
const guint8 * epan_memmem(const guint8 *haystack, guint haystack_len,
const guint8 *needle, guint needle_len);