Commit graph

48981 commits

Author SHA1 Message Date
Gerald Combs
c4a608a940 [Automatic manuf, services and enterprise-numbers update for 2013-09-22]
svn path=/trunk/; revision=52169
2013-09-22 14:03:42 +00:00
Jeff Morriss
e33209d9a4 Don't declare proto_mac_mgmt_msg_ucd_decoder twice.
svn path=/trunk/; revision=52168
2013-09-22 14:00:52 +00:00
Michael Mann
6ceb84b10b Make dissectors register for their MAC Management Message Type and use dissector_try_uint to do any dissection. Many "outside" (third-party) message types appear to exist.
Have the makefiles do all the work setting up proto_register_<dissector> and proto_reg_handoff_<dissector>, rather than sprinkled throughout the dissectors with extern declarations.

More is coming to make more functions static (because of current makefile fixes) and cleanup MAC Management dissectors to remove unnecessary/duplicative code, but I wanted to get the build issues squared away.

svn path=/trunk/; revision=52167
2013-09-22 00:50:24 +00:00
Gerald Combs
39d3b8c16a Remove U3 references.
svn path=/trunk/; revision=52166
2013-09-22 00:48:03 +00:00
Evan Huus
9afac168a7 Update to tvb_g_memdup in tvb test suite.
svn path=/trunk/; revision=52165
2013-09-21 17:37:31 +00:00
Evan Huus
6df83e8078 Add _g_ to the names of functions that allocate glib memory. This is a bit more
explicit, and frees up the "generic" names (like tvb_memdup) for new signatures
that take the appropriate wmem pool.

Majority of the conversion done with sed.

svn path=/trunk/; revision=52164
2013-09-21 17:04:41 +00:00
Evan Huus
8abfcaea79 Lower the default RTMPT max reassembly size. A bigger bandaid for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6898

svn path=/trunk/; revision=52163
2013-09-21 16:27:55 +00:00
Pascal Quantin
514b38fbdd Make it more obvious that the function is using wmem memory
svn path=/trunk/; revision=52162
2013-09-21 11:08:35 +00:00
Jeff Morriss
c90d29c668 As pointed out by Kurt in http://ask.wireshark.org/questions/24886/error-failed-build-dependencies-while-making-rpm :
If we're not building with gtk3 we now need to add --with-gtk2 .

svn path=/trunk/; revision=52161
2013-09-20 20:52:04 +00:00
Pascal Quantin
857dbb03b6 From Mathias Guettler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9159 :
ESIS dissector exception due to incorrect length parameter to 'proto_tree_add_uint'

svn path=/trunk/; revision=52160
2013-09-20 19:40:26 +00:00
Pascal Quantin
012018110a Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9164 :
Add dissector_try_uint_new() to the list of exported symbols

svn path=/trunk/; revision=52159
2013-09-20 19:11:23 +00:00
Michael Mann
a92dd77e6e Enhance DOCSIS dissector with new fields. Bug 9149 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9149)
From Jerry Negele

svn path=/trunk/; revision=52158
2013-09-20 19:02:15 +00:00
Michael Mann
61c9a77cd9 Bugfix a few items:
1. Correct Interface Flag enumeration
2. Dissect ARP data without making it look like its an ARP packet by disabling column writing.

svn path=/trunk/; revision=52157
2013-09-20 18:35:10 +00:00
Evan Huus
4212b20048 Don't use g_strv_length on a single string, just use strlen. Also do the
null-check *before* calling strlen (if it's even necessary?)

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9166

svn path=/trunk/; revision=52156
2013-09-20 14:41:22 +00:00
Anders Broman
f3e76b0953 Indicate Sequence of 0 length.
svn path=/trunk/; revision=52155
2013-09-20 14:20:06 +00:00
Anders Broman
95c5f81c83 DCH-ID can be 255
svn path=/trunk/; revision=52154
2013-09-20 14:19:31 +00:00
Anders Broman
067ca19a47 Try to make heuristic slightly faster.
svn path=/trunk/; revision=52153
2013-09-20 14:06:43 +00:00
Alexis La Goutte
9c5ff393aa From Chun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9163 Ability to Decode the Number of Mesh Peerings
Decode the mesh formation information fields related to the number of mesh peerings

Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com>

svn path=/trunk/; revision=52152
2013-09-19 21:16:46 +00:00
Alexis La Goutte
2477170d37 Add Peter Wu to AUTHORS
(Thanks for the work on SSL/TLS/DTLS Ciphers)

svn path=/trunk/; revision=52151
2013-09-19 20:41:22 +00:00
Alexis La Goutte
23f9100542 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Really add support for AEAD ciphers (GCM)

GCM uses counter mode with authentication tags (the latter is currently
not supported). As for the key material, there is no MAC (because the
auth tag is supposed to verify the authenticity).

Finally, correct the GCM cipher suite definitions: IV block size of
4 bytes and GCM instead of CBC mode.

svn path=/trunk/; revision=52150
2013-09-19 20:27:12 +00:00
Alexis La Goutte
a87da76132 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Use IV from record for CBC mode, add padding/IV length check

Add summary of RFCs to make it more obvious why certain parts (IV, MAC,
padding) are used. Merge DTLS and TLS blocks for extracting IV. This
saves an unnecessary memmove() because the input pointer is, well, just
a local variable and can therefore be incremented.

Validate padding and IV lengths before using it. A crash could occur
if the explicit IV is missing (this would make memmove write before its
buffer). The missing padding check had as implication that a misleading
error is returning with a negative length (not exploitable).

Use IV from record for CBC mode, previously it decrypted the first block
incorrectly and then threw this "decrypted" IV away. Now it extracts the
IV and uses this for decrypting the first fragment block. (remember that
CBC xor's the output of the block cipher with the previous ciphertext
(or IV for the first block)).

This is a preparation for GCM which does not have a MAC. The skip_mac
branch is necessary to make the compiler happy in this patch, 'mac'
could otherwise be uninitialised.

svn path=/trunk/; revision=52149
2013-09-19 20:27:05 +00:00
Alexis La Goutte
cf7f5dd3ad From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Correct cipher suites list, add TLS_ annotations

Add official TLS_ names as comment and correct:
- 6: RC2 is a block cipher using MD5, not stream+SHA.
- 25,26,27: should be SHA instead of MD5
- 98: DES export is a block cipher using 56-bits[1], not stream.
- 99: DES export should be using 56-bits[1].
- 138: removed commented RC4 cipher because it is not a block cipher

Besides these comments and corrections, there are no further changes.

 [1]: http://tools.ietf.org/html/draft-ietf-tls-56-bit-ciphersuites-00

svn path=/trunk/; revision=52148
2013-09-19 20:26:57 +00:00
Alexis La Goutte
f4a4271320 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Drop export_cipher and dig_len, cleaner digest access

Removed dig_len as this magic number is dependent on dig. The digests
variable is converted from a string to a structure holding the digest
name and length because of its close dependency.

Introduce another struct+function to get rid of the magic number 0x40
(DIG_MD5).

Removed export_cipher bit as this is dependent on eff_bits < bits.
Verified with:
grep ,KEX_ packet-ssl-utils.c | awk -F, '{bits=$6!=$7;ex=$9;
if ((bits && !ex) || (!bits && ex))print $6, $7, $8, "###", $0}'.

Removed space before SIG_RSA for cipher 51 for consistency with others.

svn path=/trunk/; revision=52147
2013-09-19 20:26:50 +00:00
Alexis La Goutte
9e36ab45fe Add *.lai file to wireshark
svn path=/trunk/; revision=52146
2013-09-19 20:26:41 +00:00
Evan Huus
606c422d5b Zero the key in ntlmssp, because we don't otherwise fill all of it. I suspect
the tvb_memcpy on the next line should be taking more data, but I don't know
enough about the protocol to be sure. This is the least disruptive way to fix
the last valgrind error from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8941

svn path=/trunk/; revision=52145
2013-09-19 17:39:43 +00:00
Evan Huus
27c4a47c29 Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the
collision.

svn path=/trunk/; revision=52144
2013-09-19 13:04:37 +00:00
Evan Huus
6c41404ecf From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9141
Decode AFS RXAFSCB_GetCapabilities RPC requests with their replies.

svn path=/trunk/; revision=52143
2013-09-19 13:00:57 +00:00
Evan Huus
49648069eb Remove unused enum that started conflicting with /usr/include/dirent.h on my
system.

svn path=/trunk/; revision=52142
2013-09-19 12:50:25 +00:00
Balint Reczey
d353e38a41 Revert "Prefer newer Lua versions"
The original version was OK, obviously.

svn path=/trunk/; revision=52141
2013-09-18 21:51:45 +00:00
Balint Reczey
3db47e653e Prefer newer Lua versions
svn path=/trunk/; revision=52140
2013-09-18 21:13:36 +00:00
Chris Maynard
63c297c455 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9138 (Malformed NORM packet) having to do with Wireshark assuming that all remaining bytes in the packet are part of the "cc_node_list", rather than stopping dissection according to the hdr_len field in the NORM Common Message Header.
Ref: http://tools.ietf.org/html/rfc3940#section-4.2.3.4

#BACKPORT(1.10, 1.8)

svn path=/trunk/; revision=52139
2013-09-18 14:49:03 +00:00
Jeff Morriss
b80c83618c Rename PCAP files to .pcap; set mime-type appropriately. Should these files be in the test/captures directory?
svn path=/trunk/; revision=52138
2013-09-18 14:23:14 +00:00
Gilbert Ramirez
9983ada8f5 Missed one file from dfilter-test.py
Updated license in ancient tool.

svn path=/trunk/; revision=52137
2013-09-18 05:12:04 +00:00
Gilbert Ramirez
4797eafddb Update dfilter-test.py to use a much more modern test harness,
the "unittest" module that comes with Python. Specifically, this
takes advantage of a couple of features in the "unittest" in
Python 2.7. The tests are all the same as before, but much
better managed.

This is in preparation for some work on the display filter code.

svn path=/trunk/; revision=52136
2013-09-18 05:07:46 +00:00
Chris Maynard
ab7d8cc87d Fix a couple of EXPORT_DEPENDS
svn path=/trunk/; revision=52135
2013-09-18 03:58:07 +00:00
Jörg Mayer
6883f691c7 Add the dependeny handling for windows builds as well
svn path=/trunk/; revision=52134
2013-09-18 03:31:03 +00:00
Chris Maynard
ae8824d555 Missed 1 character replacement as part of r52132.
svn path=/trunk/; revision=52133
2013-09-18 02:58:14 +00:00
Chris Maynard
b9ee9fa694 Remove all non-ASCII characters from all .asn files. I didn't see the harm in replacing them all as opposed to only those not copied verbatim from other sources.
svn path=/trunk/; revision=52132
2013-09-18 02:48:29 +00:00
Pascal Quantin
0fb41d119d From Jason Wzhy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9157 :
BSSGP: Fix dissection of Trace Type IE in SGSN-INVOKE-TRACE message

svn path=/trunk/; revision=52131
2013-09-17 21:56:35 +00:00
Pascal Quantin
953c6fed13 emem -> wmem
svn path=/trunk/; revision=52130
2013-09-17 21:34:05 +00:00
Jörg Mayer
af15a51a6b Fix remaining dependencides for -exp.cnf files.
svn path=/trunk/; revision=52129
2013-09-17 20:45:00 +00:00
Pascal Quantin
2b44f1449c Fix off by 1 error when dissecting Data Radio Bearer identity number
svn path=/trunk/; revision=52128
2013-09-17 20:06:48 +00:00
Jörg Mayer
de20bbf0ac More dependeny updates for asn1 -exp.cnf files.
Only three remaining: p7, p22, x509ce - thanks to Chris Maynard for the list.

svn path=/trunk/; revision=52127
2013-09-17 19:43:37 +00:00
Bill Meier
882ca2e76d Remove some unneeded #includes...
svn path=/trunk/; revision=52126
2013-09-17 19:23:11 +00:00
Jörg Mayer
ac6214533e Regenerate all files where the .cnf files had whitespace changes.
svn path=/trunk/; revision=52125
2013-09-17 18:55:18 +00:00
Bill Meier
7316284293 Reference 'BACnetVendorIdentifiers' value_string using
an extended value string.

svn path=/trunk/; revision=52124
2013-09-17 18:55:17 +00:00
Jörg Mayer
72f8ca4895 One of the wmem patches only updated the generated packet-snmp.c
but not the source. Fix that.

svn path=/trunk/; revision=52123
2013-09-17 18:54:18 +00:00
Gerald Combs
b1a7fc361f Switch the inline functions that use tvbuffs and emem back to macros.
This should hopefully fix linking with Solaris Studio, which doesn't
remove unused inline functions by default. Fix a copy+paste error.

svn path=/trunk/; revision=52122
2013-09-17 18:42:36 +00:00
Bill Meier
3bb06ab6a5 Fix proto_registrar_dump_protocols() bug introduced by the
implementation of BASE_VAL64_STRING value_strings.

Fixes 'tshark -G values' crash.

svn path=/trunk/; revision=52121
2013-09-17 18:33:03 +00:00
Jörg Mayer
fb834104e5 When building packet-dap.c on an empty build tree, packet-dap.c would
be incorrect on the first pass and only be correct when remade.
The reason was that disp-exp.cnf was created incorrectly on first pass.
disp-exp.cnf required dop-exp.cnf to build correctly, so add a mechanism
to add dependencies for export files.

Note: Only the cmake change has been tested, the autofoo stuff requires
  testing.

svn path=/trunk/; revision=52120
2013-09-17 18:02:25 +00:00