aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-05-02Add checkAPI calls to CMake.Graham Bloice33-61/+474
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-05-02USB Audio: Add Mixed UnitAlexis La Goutte1-0/+74
Ping-Bug: 11858 Change-Id: I53a223f1b46b513e693b40dc8754837eee5cfec0 Reviewed-on: https://code.wireshark.org/review/15242 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-02QUIC: fix decode when use version > Q033Alexis La Goutte1-33/+12
With Q033, connection id (CID) flag change (only on one byte and only say 0 or 8 bytes length cid never have length 2 or 4 bytes (from old spec), see https://groups.google.com/a/chromium.org/d/msg/proto-quic/pR6FA7oyeV8/4Ec42-GrMQAJ Change-Id: I9fffe0369a8cc0811bdbc85a9c9fa8539f049981 Reviewed-on: https://code.wireshark.org/review/15164 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>
2016-05-02PIDL: Remove _U_ and remove unused-parameter via pragmaAlexis La Goutte47-8677/+8720
Change-Id: Ic40f86850dc94338a8c2205e04679793f368672f Reviewed-on: https://code.wireshark.org/review/14967 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-05-02RTPS: Added PT PID parameters and infrastructure to dissectJuanjo Martin2-0/+168
Before, the dissector didn't have any code path to dissect the PT discovery parameters. The code path necessary as well as the parameter definitions have been added. Change-Id: I17665a56d033ffbfd16d47fe2e7374111aff9530 Reviewed-on: https://code.wireshark.org/review/14804 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-02Another "this is < WTAP_MAX_PACKET_SIZE so no checks are needed" note.Guy Harris1-0/+4
Change-Id: Ie46a141b1e41ee855defe60eba9137718770df9b Reviewed-on: https://code.wireshark.org/review/15241 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-02Remove trailing blank.Guy Harris1-1/+1
Change-Id: I57017b3e574983dac9107712a0dd6b243b62bb80 Reviewed-on: https://code.wireshark.org/review/15240 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-02Add some more checks, clean up length handling.Guy Harris1-6/+49
Check for destination or source MAC addresses that aren't 12 characters (hex dump of 6 octets) long and type/length fields that aren't 4 characters (hex dump of 2 octets) long. The buffer into which we copy the hex dump characters doesn't need to be null-terminated, so don't bother to null-terminate it. Use the final offset into the buffer as the buffer length, rather than using strlen(). Just memcpy the MAC addresses and type/length fields into the buffer; the buffer is guaranteed to be big enough for all of them, and, as noted, it doesn't need to be null-terminated. Change-Id: I790e953542ae8443af01c81229a8deb877448ee3 Reviewed-on: https://code.wireshark.org/review/15239 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-02Don't assume packets will be no larger than ISERIES_MAX_PACKET_LEN.Guy Harris1-8/+6
We don't check against it. Insteead, use phdr->caplen as the buffer size; that's based on the number of hex digits we've found. While we're at it, also get rid of ISERIES_PKT_ALLOC_SIZE - it makes it less obvious that it's based on the packet length from the packet header. Change-Id: I8ad6306c62e7bc4cf896b335f39a5a77780fb2ea Reviewed-on: https://code.wireshark.org/review/15236 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-02Make sure the packet length isn't > WTAP_MAX_PACKET_SIZE.Guy Harris1-0/+18
Change-Id: I65c1e87e2fcff93b3db998666ff51f19ecd71b55 Reviewed-on: https://code.wireshark.org/review/15233 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-01Fix wsutil/Makefile.nmake rule for ws_version_info.objJoão Valverde1-1/+2
Change-Id: I397da333b467d140613947fe49cd98338ab1d8f6 Reviewed-on: https://code.wireshark.org/review/15218 Tested-by: João Valverde <j@v6e.pt> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-01IMAP: Add heuristic check for TLSJoão Valverde3-5/+97
If the IMAP TCP stream doesn't include the STARTTLS command/response the IMAP dissector will try to dissect TLS ciphertext as IMAP protocol plaintext. Add heuristic check for SSLv3/TLS and if the heuristic matches register dissect_ssl() as the dissector for that IMAP session. Change-Id: If84eca22315193a306e93e66c608de6634e6cd85 Reviewed-on: https://code.wireshark.org/review/13570 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-01Don't treat the packet length as unsigned.Guy Harris1-3/+7
The scanf family of functions are as annoyingly bad at handling unsigned numbers as strtoul() is - both of them are perfectly willing to accept a value beginning with a negative sign as an unsigned value. When using strtoul(), you can compensate for this by explicitly checking for a '-' as the first character of the string, but you can't do that with sscanf(). So revert to having pkt_len be signed, and scanning it with %d, but check for a negative value and fail if we see a negative value. Bug: 12394 Change-Id: I4b19b95f2e1ffc96dac5c91bff6698c246f52007 Reviewed-on: https://code.wireshark.org/review/15230 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-01Don't treat the packet length as unsigned.Guy Harris1-4/+8
The scanf family of functions are as annoyingly bad at handling unsigned numbers as strtoul() is - both of them are perfectly willing to accept a value beginning with a negative sign as an unsigned value. When using strtoul(), you can compensate for this by explicitly checking for a '-' as the first character of the string, but you can't do that with sscanf(). So revert to having pkt_len be signed, and scanning it with %d, but check for a negative value and fail if we see a negative value. Bug: 12395 Change-Id: I43b458a73b0934e9a5c2c89d34eac5a8f21a7455 Reviewed-on: https://code.wireshark.org/review/15223 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-01ICMPv6: Observe "Redirected Header" option lengthJoão Valverde1-14/+19
Bug: 12400 Change-Id: Ic4116082b0f6c119172b222aadefab821f1b0971 Reviewed-on: https://code.wireshark.org/review/15205 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: João Valverde <j@v6e.pt>
2016-05-01Don't treat the packet length as unsigned.Guy Harris1-3/+8
The scanf family of functions are as annoyingly bad at handling unsigned numbers as strtoul() is - both of them are perfectly willing to accept a value beginning with a negative sign as an unsigned value. When using strtoul(), you can compensate for this by explicitly checking for a '-' as the first character of the string, but you can't do that with sscanf(). So revert to having pkt_len be signed, and scanning it with %d, but check for a negative value and fail if we see a negative value. Bug: 12396 Change-Id: I54fe8f61f42c32b5ef33da633ece51bbcda8c95f Reviewed-on: https://code.wireshark.org/review/15220 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-01Don't treat the packet length as unsigned.Guy Harris1-4/+9
The scanf family of functions are as annoyingly bad at handling unsigned numbers as strtoul() is - both of them are perfectly willing to accept a value beginning with a negative sign as an unsigned value. When using strtoul(), you can compensate for this by explicitly checking for a '-' as the first character of the string, but you can't do that with sscanf(). So revert to having pkt_len be signed, and scanning it with %d, but check for a negative value and fail if we see a negative value. Change-Id: I6450d468504e942df72342176a0e145e5ac3db5f Reviewed-on: https://code.wireshark.org/review/15216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-05-01Make class "type" for USB conversations.Michael Mann5-2/+20
USB dissectors can't assume that only their class type has been passed around in the conversation. Make explicit check that class type expected matches the dissector and stop/prevent dissection if there isn't a match. Bug: 12356 Change-Id: Ib23973a4ebd0fbb51952ffc118daf95e3389a209 Reviewed-on: https://code.wireshark.org/review/15212 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-01qt: SH_ScrollBar_Transient is not available for Qt <= 5.2Martin Kaiser1-0/+2
add a version check in order to fix compilation with older Qt versions (I couldn't figure out when exactly SH_ScrollBar_Transient was introduced. It appears in the Qt 5.6 documentation, it's unavailable in Qt 5.2) Change-Id: Idf7ea1302e4a40e290a6750cbe077d9d2b7b56a8 Reviewed-on: https://code.wireshark.org/review/15196 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-01zvt: return -1 if we need more data from tcpMartin Kaiser1-0/+1
0 means that the dissector rejected the packet. Change-Id: I9e04443a5f378198f94038e0e67b2e1fde8054be Reviewed-on: https://code.wireshark.org/review/15210 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01ldss: remove if (tree) checksMartin Kaiser1-151/+138
Change-Id: Ib453a247eb1a2b6e88b3a4abab301bdc7c18bdb0 Reviewed-on: https://code.wireshark.org/review/15209 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01ldss: return -1 (not 0) if we need more data from TCPMartin Kaiser1-1/+1
If a dissector returns 0, it rejects the packet ("this is not my protocol"). This is in contradiction to requesting more data from TCP. Bug: 12359 Change-Id: Ib0da7fc3ef92b35b3950e74f50484d9e21a93a6f Reviewed-on: https://code.wireshark.org/review/15198 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-05-01[Automatic update for 2016-05-01]Gerald Combs11-2527/+1147
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Icfa09469ffc84943f9e54eae10f60001a3790694 Reviewed-on: https://code.wireshark.org/review/15206 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-05-01qt: don't declare dp_ratio for Qt < 5.1Martin Kaiser2-2/+2
this avoids warnings about unused variables Change-Id: I0ee033f90c1387615ffc167161e53f4293d89763 Reviewed-on: https://code.wireshark.org/review/15195 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-30Return the same error for too-large packets as we do for other files.Guy Harris1-2/+9
And note that our limit (which is what we use as the fixed buffer size) is less than WTAP_MAX_PACKET_SIZE, so we don't have to check against WTAP_MAX_PACKET_SIZE. Change-Id: I28cd95c40fd2fba9994a5d64ef323f1d8c1c4478 Reviewed-on: https://code.wireshark.org/review/15204 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Note that we don't have to worry about too-large packets.Guy Harris1-0/+4
Change-Id: If72fb1ed64686348fa24b441cba8534fadc0e707 Reviewed-on: https://code.wireshark.org/review/15203 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Clean up packet length handling.Guy Harris1-7/+25
Treat the packet length as unsigned - it shouldn't be negative in the file. If it is, that'll probably cause the sscanf to fail, so we'll report the file as bad. A normal packet should be Ethernet-sized; initially make the buffer big enough for a maximum-sized Ethernet packet. Once we know the payload length, check to make sure the packet length won't be > WTAP_MAX_PACKET_SIZE and fail if it will. Then boost the buffer size to be large enough for the packet, even if it's bigger than a maximum-sized Ethernet packet. Change-Id: I75b2108dd68f5bc5cd436bf5b82990089a7116bf Reviewed-on: https://code.wireshark.org/review/15200 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30qt: use NULL instead of Q_NULLPTRMartin Kaiser1-1/+1
Q_NULLPTR is not defined in Qt4 Change-Id: I0dd5444c6c019b7e8f1a346d9e12432d9b306d8a Reviewed-on: https://code.wireshark.org/review/15197 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-04-30Have daintree_sna_read_packet() do all the packet reading work.Guy Harris1-60/+32
Share more code between the read and seek-read routines. Also note why that code doesn't have to check against WTAP_MAX_PACKET_SIZE. Change-Id: I09086fcd3c16883c2598fb0aeb172c66f480d315 Reviewed-on: https://code.wireshark.org/review/15193 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30IPv4: use calculated value for Header Length display filterPascal Quantin1-4/+4
Bug: 12387 Change-Id: I63370ea884b6fb75a0743fecc06af2e213700645 Reviewed-on: https://code.wireshark.org/review/15163 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-30Don't bother checking for getaddrinfo(): we don't use it.Jeff Morriss4-9/+0
Since Ie5e670b769eb0674950f3679ef511047641c2873 we no longer support synchronous name resolution. Change-Id: Icc65bd665bd610d89f894549e77608cfb5ef4c53 Reviewed-on: https://code.wireshark.org/review/15165 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-30Netflow: Updating the list of Ixia IxFlow fieldsDeep Datta1-0/+104
Change-Id: I38c2b337bf276f6edc6b5d3f10e47ae81a1610b5 Reviewed-on: https://code.wireshark.org/review/15167 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>
2016-04-30Add TCP preference for Process information from IPFIXMichael Mann3-36/+52
The preference is disabled by default and saves a little bit of memory for those that don't get process information from IPFIX. Change-Id: I4b6a106d156862a8d53bf2ad5ee88ea857637815 Reviewed-on: https://code.wireshark.org/review/15139 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>
2016-04-30Check for packets bigger than WTAP_MAX_PACKET_SIZE.Guy Harris1-46/+70
Change-Id: Iaa4865393e711633312e44eaba4985c75668746a Reviewed-on: https://code.wireshark.org/review/15190 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30debian: Fix hardening-check during package buildBalint Reczey1-1/+1
Change-Id: I30465f1cd0b725e58f3445813e443521350900a2 Reviewed-on: https://code.wireshark.org/review/15160 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-04-30Check for packets bigger than WTAP_MAX_PACKET_SIZE.Guy Harris1-0/+11
Change-Id: Ia932f3e5aeaca7a566ea9f00ce1dca1a2071a1a4 Reviewed-on: https://code.wireshark.org/review/15187 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Note some cases where we don't need to check the packet length.Guy Harris11-0/+70
These file formats have 16-bit packet lengths, so, even with some extra metadata added, the packet data length will never be bigger than WTAP_MAX_PACKET_SIZE. (No, we won't ever reduce WTAP_MAX_PACKET_SIZE.) Change-Id: I9e1b1d90971f91cc6e5d66d0aa93841445b2bc22 Reviewed-on: https://code.wireshark.org/review/15186 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Check for packets bigger than WTAP_MAX_PACKET_SIZE.Guy Harris1-0/+11
Change-Id: If7cd6ae60b805121c3f54dcaa48d730b6cd9b648 Reviewed-on: https://code.wireshark.org/review/15183 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Check for packets bigger than WTAP_MAX_PACKET_SIZE.Guy Harris1-0/+20
And note the cases where we don't have to check, as the length in the file is 2 bytes long, and 65535 + the metadata length is < WTAP_MAX_PACKET_SIZE. Change-Id: I1e690eeee900b9aa7484dc0bd0c106dc38c77269 Reviewed-on: https://code.wireshark.org/review/15180 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Use WTAP_MAX_PACKET_SIZE as the maximum packet length.Guy Harris1-8/+3
And use the actual packet length, rather than a fixed value, as the buffer size we need for the packet. Change-Id: I3af6724210a85b50610839d1bdf97fcf5a152b2f Reviewed-on: https://code.wireshark.org/review/15179 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-30Fix packet length handling.Guy Harris2-64/+40
Treat the packet length as unsigned - it shouldn't be negative in the file. If it is, that'll probably cause the sscanf to fail, so we'll report the file as bad. Check it against WTAP_MAX_PACKET_SIZE to make sure we don't try to allocate a huge amount of memory, just as we do in other file readers. Use the now-validated packet size as the length in ws_buffer_assure_space(), so we are certain to have enough space, and don't allocate too much space. Merge the header and packet data parsing routines while we're at it. Bug: 12396 Change-Id: I7f981f9cdcbea7ecdeb88bfff2f12d875de2244f Reviewed-on: https://code.wireshark.org/review/15176 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-29Qt: Make sure we pass along a resizeEvent.Gerald Combs2-2/+3
Change-Id: I6bf07058b0a5b53fe862f4ca414602c658cf50dd Reviewed-on: https://code.wireshark.org/review/15168 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-29Fix packet length handling.Guy Harris1-46/+29
Treat the packet length as unsigned - it shouldn't be negative in the file. If it is, that'll probably cause the sscanf to fail, so we'll report the file as bad. Check it against WTAP_MAX_PACKET_SIZE to make sure we don't try to allocate a huge amount of memory, just as we do in other file readers. Use the now-validated packet size as the length in ws_buffer_assure_space(), so we are certain to have enough space, and don't allocate too much space. Merge the header and packet data parsing routines while we're at it. Bug: 12395 Change-Id: Ia70f33b71ff28451190fcf144c333fd1362646b2 Reviewed-on: https://code.wireshark.org/review/15172 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-29Qt: Add recent items to the OS X dock menu.Gerald Combs3-7/+60
Qt 5.2 added QMenu::setAsDockMenu. Use it to add recent items to the Wireshark dock menu. Add QWinJumpList code which does something similar. Comment it out because it does it slowly and not-quite-correctly. Change-Id: I801b1037b998516eacab695f982d7d6e889bafb6 Reviewed-on: https://code.wireshark.org/review/15166 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-04-29Fix packet length handling.Guy Harris1-8/+14
Treat the packet length as unsigned - it shouldn't be negative in the file. If it is, that'll probably cause the sscanf to fail, so we'll report the file as bad. Check it against WTAP_MAX_PACKET_SIZE to make sure we don't try to allocate a huge amount of memory, just as we do in other file readers. Use the now-validated packet size as the length in ws_buffer_assure_space(), so we are certain to have enough space, and don't allocate too much space. Bug: 12394 Change-Id: Ifa023ce70f7a2697bf151009b035a6e6cf8d5d90 Reviewed-on: https://code.wireshark.org/review/15169 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-04-29[Diameter AVPs] Add AVP 620 Redirect-RealmAndersBroman1-1/+3
Bug 12381 Change-Id: I8ba1306661b4b2c30c865761e1c2a90b5e4140b0 Reviewed-on: https://code.wireshark.org/review/15162 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-29ANSI IS-637 A: fix display of reserved bits when using 7bits GSM encodingPascal Quantin1-3/+63
Change-Id: Ida59c339d174e8f9a3b8bf108374875d12c51b21 Reviewed-on: https://code.wireshark.org/review/15153 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-04-29Separate out the members of tcp_flow_t structure that are only used for ↵Michael Mann2-58/+73
sequence analysis. That way they only need to be allocated if analysis is being done. Inspired by https://www.wireshark.org/lists/wireshark-dev/201604/msg00218.html Ping-Bug: 12367 Change-Id: I797e5b305133d85a2a89688109cc3a218d0a9e88 Reviewed-on: https://code.wireshark.org/review/15138 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-29Update BPKM Auth Reply key length for DOCSIS 3.1Philip Rosenberg-Watt1-1/+1
Wireshark was failing to parse DOCSIS 3.1 BPKM Response (Auth Reply) messages with a key length of 256 bytes, which is in the DOCSIS 3.1 specification located here: http://www.cablelabs.com/specification/docsis-3-1-security-specification/ See Appendix I.4 "Authorization Reply" Change-Id: Ic50eb4a2d637a7bc47385b7c0a96c830f7a920be Reviewed-on: https://code.wireshark.org/review/15149 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-29make-version.pl: Preserve line endings.Gerald Combs1-2/+2
Make sure we replace a line using the same line endings. Change-Id: I73b07a773bc39b05ba7a73b3c3c984a73c545a48 Reviewed-on: https://code.wireshark.org/review/15157 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>