In the 802.11 dissector, mark the "wep_keys" preference as obsolete,

and replace it with an "enable_decryption" preference.

Instead of forcing the user to specify how many WEP keys we have,
figure it out for ourselves by parsing the key list.  When decrypting,
don't worry about the key index specified in the header (which resulted
in trying to decrypt using the same key twice); simply try each key in
order (which we were doing anyway).

In hex_str_to_bytes(), handle a null hex string.

Update the release notes.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19592 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 3 insertions, 0 deletions

diff --git a/epan/strutil.c b/epan/strutil.c
index 4ada04a2e9..6c198a3a66 100644
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -431,6 +431,9 @@ hex_str_to_bytes(const char *hex_str, GByteArray *bytes, gboolean force_separato
 	char		one_digit[2];
 
 	g_byte_array_set_size(bytes, 0);
+	if (! hex_str) {
+		return FALSE;
+	}
 	p = (const guchar *)hex_str;
 	while (*p) {
 		q = p+1;