Commit Graph

69 Commits

Author SHA1 Message Date
Ronnie Sahlberg 722ab30a62 we must include config.h or else NEED_G_ASCII_STRCASECMP_H will never be
defined

we must also include g_ascii_strcasecmp.h from the parent directory


svn path=/trunk/; revision=23634
2007-11-28 01:20:46 +00:00
Guy Harris 9c89cdaaa3 strcasecmp(), strncasecmp(), g_strcasecmp(), and g_strncasecmp() delenda
est.  Use g_ascii_strcasecmp() and g_ascii_strncasecmp(), and supply our
own versions if they're missing from GLib (as is the case with GLib
1.x).

In the code to build the list of named fields for Diameter, don't use
g_strdown(); do our own g_ascii_-style upper-case to lower-case mapping
in the hash function and use g_ascii_strcasecmp() in the compare
function.

We do this because there is no guarantee that toupper(), tolower(), and
functions that use them will, for example, map between "I" and "i" in
all locales; in Turkish locales, for example, there are, in both
upper case and lower case, versions of "i" with and without a dot, and
the upper-case version of "i" is "I"-with-a-dot and the lower-case
version of "I" is "i"-without-a-dot.  This causes strings that should
match not to match.

This finishes fixing bug 2010 - an earlier checkin prevented the crash
(as there are other ways to produce the same crash, e.g. a bogus
dictionary.xml file), but didn't fix the case-insensitive string matching.

svn path=/trunk/; revision=23623
2007-11-27 18:52:51 +00:00
Gerald Combs 6327c19912 From Christopher McKenzie: Zero out our SAs before we use them.
Remove an unneeded for loop in AirPDcapCleanKeys(), and make it static.

svn path=/trunk/; revision=23314
2007-10-31 00:15:17 +00:00
Sake Blok 6bec9d3d9e From tmiller@hcjbtech.org : Spelling error on GDS DB protocol dissector: "Buffer lenght:"
(recursively grepped through the source and corrected all occurences, even 
the ones just in comments)



svn path=/trunk/; revision=23211
2007-10-16 23:42:33 +00:00
Gerald Combs d75af45adc Make the WPA passphrase a percent-escaped string. Constify and GLib-ize
some variables.

svn path=/trunk/; revision=22210
2007-06-27 19:02:58 +00:00
Gerald Combs 4944cdc899 A recent checkin broke wpa-psk keys; fix it.
svn path=/trunk/; revision=22169
2007-06-23 00:00:57 +00:00
Gerald Combs 7efcc33a1e In packet-ieee802.11.c, fix a serious preference bug introduced in the
last checkin.  In airpcap.c, appease the toolbar code by returning a
lower-case, non-separated WEP key.

svn path=/trunk/; revision=22152
2007-06-21 20:22:56 +00:00
Gerald Combs 249a747c51 Be less restrictive about WEP key preferences. Use hex_str_to_bytes to
process WEP keys.  Allow the "wep:" prefix for WEP keys even when
HAVE_AIRPDCAP isn't defined.  Add a NULL pointer check to
hex_str_to_bytes().  Fixes bug 1584.

Fixup indentation.

svn path=/trunk/; revision=22151
2007-06-21 17:49:03 +00:00
Gerald Combs c992e2a3c5 Be a little less picky about EAPOL packet lengths. Someone sent in a
capture that has extra data in the 4th handshake message.

svn path=/trunk/; revision=22138
2007-06-18 21:58:34 +00:00
Gerald Combs 1d567d6e6b The 802.11 dissector calculates the header size, so pass that value to
the WEP/WPA decryption code instead of re-calculating it.  Fixes bug
1639.

Remove fcsPresent, radiotapPresent, and associated code from airpdcap.c
since they were always FALSE.  Glib-ize some data types.  Fixup white
space.

Update the release notes.

svn path=/trunk/; revision=22104
2007-06-14 22:09:14 +00:00
Bill Meier a6dab6d644 (Minor) Use _WIN32 (instead of WIN32) like the rest of Wireshark
svn path=/trunk/; revision=22030
2007-06-03 16:07:07 +00:00
Gerald Combs 7c8bb268ca The fix for ad-hoc WEP decryption in r21814 broke WPA. Replace it with
a better fix.  Clean up whitespace while we're at it.

svn path=/trunk/; revision=21847
2007-05-20 22:40:35 +00:00
Gerald Combs 86865b0fb8 Try WEP decryption before WPA. This keeps us from returning
prematurely if we have an IBSS frame.

svn path=/trunk/; revision=21814
2007-05-17 17:14:39 +00:00
Guy Harris 1b2cecda53 Need to include <epan/pint.h> to get pletohl() defined.
svn path=/trunk/; revision=21544
2007-04-23 22:34:31 +00:00
Guy Harris d6fc852779 byteReverse assumes its argument is aligned on a 32-bit boundary; make
it a pointer to a guint32.  Also, use pletohl() to fetch a 32-bit
little-endian quantity.

svn path=/trunk/; revision=21542
2007-04-23 21:23:30 +00:00
Guy Harris 5a4771d9cb The "in" array in an MD5 context is expected to be aligned on a 4-byte
boundary; make it an array of 16 guint32's rather than 64 guint8's, to
ensure that, and add now-necessary casts and remove now-unnecessary
casts.

(Missed on the previous checkin.)

svn path=/trunk/; revision=21541
2007-04-23 21:12:04 +00:00
Guy Harris 0acc6bc5b8 The "in" array in an MD5 context is expected to be aligned on a 4-byte
boundary; make it an array of 16 guint32's rather than 64 guint8's, to
ensure that, and add now-necessary casts and remove now-unnecessary
casts.

svn path=/trunk/; revision=21540
2007-04-23 20:47:07 +00:00
Guy Harris 8e32c1e739 Get rid of no-longer-needed, and warning-generated, casts.
svn path=/trunk/; revision=21536
2007-04-23 18:30:29 +00:00
Guy Harris cdb59eed63 Make Mk16_le() work on both big-endian and little-endian processors and
on processors that don't support unaligned loads - just use pletohs().

svn path=/trunk/; revision=21534
2007-04-23 18:11:12 +00:00
Guy Harris 877db595ff Don't assume byte pointers can be safely cast to more aligned pointers;
the compiler now warns of that.

svn path=/trunk/; revision=21530
2007-04-23 17:33:29 +00:00
Guy Harris 552fff182e Don't assume a pointer to UCHAR is necessarily aligned; that now
generates a warning.

svn path=/trunk/; revision=21528
2007-04-23 16:41:31 +00:00
Guy Harris 065be642f4 Get rid of some const warnings.
Use the "pnto" macros to fetch 16-bit quantities from a buffer - not
only do they have the right casts to avoid const warnings, they also
work even on platforms (such as SPARC) where you can't dereference
unaligned pointers without a trap.

Similarly, compare a possibly-unaligned (we make no alignment guarantees
in Wireshark) 16-bit quantity against 0 a byte at a time.

svn path=/trunk/; revision=21507
2007-04-22 18:26:45 +00:00
Guy Harris 6327554e6c Check the GLib version number, not the GTK+ version number; it's GLib we
care about, and this code doesn't use GTK+, so it doesn't include any
GTK+ headers and therefore doesn't get the GTK+ version number defined.

svn path=/trunk/; revision=21506
2007-04-22 18:04:52 +00:00
Ronnie Sahlberg 7a97135752 GString.len has changed signednedd between gtk1 and gtk2
this will hopefully again compile under both gtk1 and 2


svn path=/trunk/; revision=21499
2007-04-22 15:22:53 +00:00
Jörg Mayer 7b20d35047 Fix a signedness warning.
svn path=/trunk/; revision=21497
2007-04-22 11:51:36 +00:00
Ronnie Sahlberg 99bc488535 fix the sign of a variable to prevent a singed/unsigned warning during
compiling


svn path=/trunk/; revision=21494
2007-04-22 09:58:12 +00:00
Sebastien Tandel 84e1cfee7f delete Td4 as it is used only in rijndaelDecrypt and rijndaelDecryptRound not
present in the wireshark code

svn path=/trunk/; revision=21429
2007-04-14 11:55:19 +00:00
Jörg Mayer cee590823d - Add Makefile.common to EXTRA_DIST (spotted by Christopher Maynard)
- Replaced spaces at beginning of line by tab

svn path=/trunk/; revision=21267
2007-03-29 07:41:54 +00:00
Jeff Morriss 13942d6fa3 Don't #define bzero and bcopy to be memset and memcpy on Windows, just use memset and memcpy instead.
svn path=/trunk/; revision=21201
2007-03-26 03:59:09 +00:00
Stephen Fisher 62f88a4a04 From Sebastien Tandel:
(Temporarily disable the warnings as errors default on Unix to get
to get the buildbots and people with gcc40 going again until those
additional warnings gcc40 generates can be fixed-I'm working on it
ASAP)

   Patch for configure.in which disables by default the treatment of
warnings as errors.
It can be enabled with './configure --with-warnings-as-errors'.
The macro will test first if GCC is present. If it's the case,
HAVE_WARNINGS_AS_ERRORS is defined. All the USING_GCC have been replaced
by HAVE_WARNINGS_AS_ERRORS.
With this switch, people won't suffer from unexpected warnings when
downloading svn sources during the transition time ;)


svn path=/trunk/; revision=21153
2007-03-23 17:49:59 +00:00
Stephen Fisher 84c5becd89 Add -Werror for gcc to a few more directories and fix a few warnings
svn path=/trunk/; revision=21129
2007-03-22 23:24:13 +00:00
Ulf Lamping dcb1e1bdfd add "treat warnings as errors" flag(s)
svn path=/trunk/; revision=21125
2007-03-22 22:54:00 +00:00
Luis Ontanon 69e27560c2 From: Sebastien Tandel
And here is the patch to change guint -> guint32 in the hmac function.


svn path=/trunk/; revision=21037
2007-03-16 21:22:35 +00:00
Guy Harris 2b75ac83af Eliminate __inline - not all compilers support it.
svn path=/trunk/; revision=20932
2007-02-25 23:25:23 +00:00
Guy Harris 3496de0ff1 ANSI C defines size_t; if we don't have that defined, we have bigger
problems, and there's no guarantee that _SIZE_T is defined on all ANSI C
platforms, so you might end up with a redefinition and a compile failure.

svn path=/trunk/; revision=20931
2007-02-25 22:46:54 +00:00
Gerald Combs 183cbf95cc WEP decryption is destructive -- pass a fresh copy of our data buffer
instead of the actual buffer.  Add an entry to the release notes, and
clear out leftovers from the 0.99.5 release.

svn path=/trunk/; revision=20875
2007-02-20 18:44:22 +00:00
Bill Meier 547a03b25b Fix some C++ style comments
svn path=/trunk/; revision=20865
2007-02-19 21:45:27 +00:00
Stephen Fisher 0ebc01dc03 From Sebastien Tandel:
Create two new files (ws_strsplit.[ch]) that use GTK2 code to override
the buggy g_strsplit() function when compiling for GTK1.  Include this
work-around function (ws_strsplit) in libwireshark.def.  Add notes on usage
to README.developer.  Include epan/ws_strsplit.h in all files that use
g_strsplit().


svn path=/trunk/; revision=20804
2007-02-13 20:57:22 +00:00
Jeff Morriss 0c17bfd3a8 From Eric Hall to fix bug 1289:
http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1289

Rename 'svnversion' to 'wireshark_svnversion' to resolve a symbol conflict with
GTK 2.10.6 (hmm, shouldn't GTK not be exporting that symbol or at least naming
it so as to prevent such collisions? Well, so should we, so...)

From Andreas Fink: change #ifdef for size_t in airdcap_interop.h to fix
compile on MacOS X.


svn path=/trunk/; revision=20726
2007-02-06 02:27:59 +00:00
Gerald Combs 6132c5b323 Fix saving WPA key preferences from the decryption key management dialog,
which was broken by r20388.

svn path=/trunk/; revision=20573
2007-01-26 23:28:22 +00:00
Gerald Combs f9e2736d7c Add support for "wildcard" WPA keys in the form "wpa:passphrase" (note
the lack of SSID).  Wildcarding combines the passphrase with the last
seen SSID and attempts decryption.  The last-seen stack is only one
element tall, which means it may get clobbered on busy and diverse
networks.  We can expand it if needed.

Make internal functions static in airpdcap.c.  Rearrange the
AIRPDCAP_KEY_ITEM struct so that the passphrase and SSID don't get
clobbered when we set our PSK.

svn path=/trunk/; revision=20572
2007-01-26 21:54:59 +00:00
Gerald Combs 2664012ca6 Fix a key preference crash bug. Improve WPA passphrase and SSID length
handling.  Free a byte array.  Squelch a compiler warning.  Fix a URI
string parsing bug.

svn path=/trunk/; revision=20549
2007-01-25 01:24:14 +00:00
Stephen Fisher a5b223382f From Gisle Vanem: Add the final ) to a g_strdup_printf call
svn path=/trunk/; revision=20457
2007-01-16 21:16:45 +00:00
Gerald Combs ba4a327704 Add copyright attributions and licenses. License each derived work
according to its pedigree.

svn path=/trunk/; revision=20401
2007-01-12 00:54:13 +00:00
Gerald Combs f67fdf4865 Move sha1.[ch] to epan/crypt/crypt-sha1.[ch]. Remove duplicate code.
svn path=/trunk/; revision=20399
2007-01-12 00:33:32 +00:00
Gerald Combs def1f435fc Fix compilation problems under Windows. In the GTK code, convert SSIDs
to GByteArrays.  Add format_uri() to strutil, which formats a byte string
with percent-escapes.  Fixup whitespace and indentation.

svn path=/trunk/; revision=20397
2007-01-11 22:12:33 +00:00
Gerald Combs 983f496f69 Add uri_str_to_bytes(), byte_array_dup(), and byte_array_equal()
functions to strutil.  Use GByteArrays to store SSIDs for decryption,
and let the user specify arbitrary byte strings using percent-encoded
strings.  We should probably add percent encoding for pass phrases as
well, so you can escape the ":" character.

Move the key struct key conversion utilities to airpdcap.c, and remove
duplicate code from packet-ieee80211.c.  Fix a lot of indentation.

svn path=/trunk/; revision=20388
2007-01-11 02:42:34 +00:00
Jaap Keuter 6b97952ede Trying to get buildbot Ubuntu-5.10-x86 distcheck to build again
svn path=/trunk/; revision=20376
2007-01-10 14:37:24 +00:00
Ulf Lamping 2dbb754dc2 vastly simplify the Makefile by using Makefile.common - as this is what this file is intended to be - to be common for UNIX and Windows builds ;-)
svn path=/trunk/; revision=20374
2007-01-10 09:54:31 +00:00
Tomas Kukosa b3df178624 add missing object files into epan/crypt/Makefile.nmake
svn path=/trunk/; revision=20371
2007-01-10 07:06:16 +00:00