summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-26ssl: return early if no private keys are foundPeter Wu1-0/+8
There is no need to check for private keys if there are none. In addition, print the number of keys for debugging purposes. Change-Id: Idc9d650e0bf087c0f647dba4e5bd4920b4f6e228 Reviewed-on: https://code.wireshark.org/review/1367 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-26ssl: Reduce chance of hash-collisions SSL private keysPeter Wu1-0/+1
The wildcard address contains all zeroes, resulting in the same hash for 0.0.0.0 and ::. Not really problematic, but it does not sound great either. Change-Id: I099128973a1bd8bb5c88d0abcab3ea4ecc3a96c9 Reviewed-on: https://code.wireshark.org/review/1366 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-26Change ssl_find_private_key to voidPeter Wu2-5/+3
No caller checks its return value (which is always 0). Change-Id: I18461ee6e5d369722c8c2b2ea1e409423aa5d631 Reviewed-on: https://code.wireshark.org/review/1365 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-26Added fields used by HP MSM access points.Lasse Luttermann Poulsen1-0/+203
Change-Id: I367c99bb351993f05161d683eb54f08e5852145f Reviewed-on: https://code.wireshark.org/review/1347 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-26Dissect all details in NAT-T LCAF type...Lorand Jakab1-11/+55
... and remove last remaining proto_tree_add_text() calls! Change-Id: I22e5446a06c22ba1f30f342b21f7676641a7f2e7 Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/1352 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-26Updated gvcp dissectorwarren1-442/+3793
Change-Id: I49f6acecdbcdf171ba28af171f8067322cc5ecf1 Reviewed-on: https://code.wireshark.org/review/1220 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-25wtap_read() and wtap_seek_read() handle caplen > len; don't do it here.Guy Harris1-6/+0
Change-Id: Iac083abdbaaa4666124e5b296e6f8306ee90f32d Reviewed-on: https://code.wireshark.org/review/1363 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25This doesn't have separate captured and actual length, either.Guy Harris1-1/+1
Change-Id: I4605bde8a2951ea78d507bab6fcf004ebef6f38f Reviewed-on: https://code.wireshark.org/review/1362 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Put the common code for reading Logcat packets into a routine.Guy Harris1-81/+35
Then have the read and seek-read routines both use that routine. Change-Id: I3d11df82644207d0ae59486231c91e1f044090ab Reviewed-on: https://code.wireshark.org/review/1361 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25No need to set "line" when setting "firstline".Guy Harris1-2/+2
"line" is used only in the main loop processing the lines. Change-Id: I370c6516867a9c972f9673b3362141f0f42d178a Reviewed-on: https://code.wireshark.org/review/1360 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Get rid of a (now-)redundant call to tvb_get_ptr().Guy Harris1-14/+14
Also, shuffle some comments around to make them better describe what's happening. Change-Id: Ie4d71e7c64b68a7f02b4ec6cd2d8601a796a9867 Reviewed-on: https://code.wireshark.org/review/1359 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Clean up code formatting a bit.Guy Harris1-10/+10
Change-Id: I8f82630f59304149293680f742d490767b88179e Reviewed-on: https://code.wireshark.org/review/1358 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25remove some more unnecessary initial valuesMartin Kaiser1-5/+5
Change-Id: If2abfee444c7a4a163fef031d92b7757b5d23855 Reviewed-on: https://code.wireshark.org/review/1355 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-25remove unnecessary initial valuesMartin Kaiser1-3/+3
Change-Id: I0950daa18c4234677d29101fac74f6f6bd977ef3 Reviewed-on: https://code.wireshark.org/review/1354 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-25Don't fail if a pcap-NG PB or EPB has caplen > actual len.Guy Harris2-7/+19
We don't fail for other file types; there's no point in failing for pcap-NG. wtap_read() will ensure that caplen <= len. Make wtap_seek_read() ensure that caplen <= len as well. Fixes bug 10037. Change-Id: I41fbcf54341ea0429cef875442ea1f1377177a5f Reviewed-on: https://code.wireshark.org/review/1353 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Fix reading keyfile for "any" IP addressPeter Wu1-0/+3
The same file pointer is used for both IPv4 and IPv6. Change-Id: I448ee10426882dcd5bcddf6b005ca1d07fe9572c Reviewed-on: https://code.wireshark.org/review/1345 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-25Revert back to emem due to UAT usePeter Wu1-7/+7
Partially reverts "Convert SSL and TCP dissectors to wmem (with the exception of UAT)." (960a461c8a54460db372968854f6280f9c48a41d). ssl_load_pkcs12 is called in UAT context via ssldecrypt_uat_fld_password_chk_cb and ssl_parse_key_list (dtls/ssl). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10038 Change-Id: I22220fd128b17e273c5ed572a83edbfb8261bda9 Reviewed-on: https://code.wireshark.org/review/1344 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-25Fix fuzz failure. Bug 10041.Michael Mann1-2/+2
Always need to initialize "firstline" when "line" is initialized. Bug:10041 Change-Id: Iecee2e387e4a35f0d7126f8f14aa5bd34449a5d3 Reviewed-on: https://code.wireshark.org/review/1351 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-25Make COMPUTE_OFFSET and COMPUTE_OFFSET_AND_REMAINING macros.AndersBroman1-81/+87
Change-Id: I7a7b5869947499c2e0edb4de4bb462d8e8c19fc7 Reviewed-on: https://code.wireshark.org/review/1346 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Kerberos: ensure that private data elements are stored in separate variablesPascal Quantin3-283/+207
Bug: 10028 Change-Id: I599cd5475d19b64c0d5b9d31d7054a3befc84af2 Reviewed-on: https://code.wireshark.org/review/1348 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-04-25Dissect all details in ELP LCAF type...Lorand Jakab1-12/+94
... and remove more of the remaining proto_tree_add_text() calls. Change-Id: I0286af7fd6953b9276c15b3e7ce7d80c1bd39e8a Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/1350 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Fold alloc_field_info() into proto_tree_add_pi().AndersBroman1-16/+3
Change-Id: Iba9c6133d686fdcf70645238f8bd312815d377b0 Reviewed-on: https://code.wireshark.org/review/1349 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Use 4-space indentation consistently in epan/charsets.c.Guy Harris1-314/+314
Make the EBCDIC <-> ASCII translation tables const, while we're at it. Change-Id: I15a08f7329fd32f758cf36898fe4214ae8540462 Reviewed-on: https://code.wireshark.org/review/1343 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Add a get_ebcdic_string() routine, similar to other get_XXX_string() routines.Guy Harris3-198/+228
Use it in epan/tvbuff.c. Do some other cleanups while we're at it. Change-Id: I7aed37a568373b896aacfd23f986d445b58b77b7 Reviewed-on: https://code.wireshark.org/review/1342 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Another whitespace cleanup.Guy Harris1-1/+1
Change-Id: I7c5c557730fb59244bc82c35fcf79c40991d4d99 Reviewed-on: https://code.wireshark.org/review/1341 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Fix some white space.Guy Harris1-5/+5
Change-Id: I9adec36251e27e71c530e64a472ab7562bd07fed Reviewed-on: https://code.wireshark.org/review/1340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Move the XXX-to-UTF-8 loops to routines in epan/charsets.c.Guy Harris4-497/+605
This moves a bunch of character set knowledge into epan/charsets.c. Change-Id: Ieb79dcaac9753c77703af756b666ad2ca9385d9e Reviewed-on: https://code.wireshark.org/review/1339 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Try to please the build boot.AndersBroman1-1/+1
Change-Id: I304960a0d1c8e64947a7f35e90da279e43051aac Reviewed-on: https://code.wireshark.org/review/1338 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Fix encodings (found by fix-encoding-args.pl)Lorand Jakab1-5/+5
Change-Id: I9bbdf61b6ac0b24dea4993f07b2608538ef220b2 Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/1336 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Support out-of-source checkapiStig Bjørlykke32-42/+88
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Create the HTTP tree and set column info after we're assured it's HTTP. ↵Michael Mann1-11/+21
Otherwise a bogus tree is created when HTTP2 traffic is found. Also, COL_PROTOCOL and COL_INFO can be prematurely populated. Change-Id: I9f1c736baaeb86f9fab61601d79e79b4e3a16c38 Reviewed-on: https://code.wireshark.org/review/1334 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Don't use HTTP filter for DTLS decryption test as it's not really HTTP ↵Michael Mann2-2/+2
traffic (and a more discerning HTTP dissector will cause this to fail) Change-Id: I74ea78f541f87000d84c85794d04e9de46d477f2 Reviewed-on: https://code.wireshark.org/review/1333 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Move GSM guint8 to unicode conversion functions to charsets.cJakub Zawadzki3-61/+68
charsets.c is already place with huge number of conversion tables. Also make gsm_default_alphabet gunichar2, all values fits in 2 bytes. Change-Id: Ia5ab6c176b4fec21ec76b06513c1d00794ba10ef Reviewed-on: https://code.wireshark.org/review/1328 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Move mktime_utc() from tvbuff.c to wsutil/time_util.cJakub Zawadzki5-40/+99
Also do little cleanup in mktime_utc (one big #ifndef) Change-Id: I8f721ba76cad856cfef0a2d78e7f98686f8e4e3f Reviewed-on: https://code.wireshark.org/review/1327 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Cleanup "excess" from trying to support sequence of "native types". Last ↵Michael Mann5-2014/+1097
installment of bug 9532. Cleaned up wireshark_gen.py so that it no longer generates duplicate fields and greatly minimized the number of useless hf_ variables generated. Change-Id: I26b2ddb5b65fcde99787cc2771348aa1b37f919f Reviewed-on: https://code.wireshark.org/review/1329 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25Convert "4 space tabs" to spaces;Bill Meier1-92/+105
Add editor modelines. Change-Id: I360a557a1e9753c4ae7ab95213aa8d44000f7dfd Reviewed-on: https://code.wireshark.org/review/1335 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-24Consistently use the macro PROTO_REGISTRAR_GET_NTH in proto.cAndersBroman1-9/+19
Change-Id: Iecfdd9463bec7958e8ede764bf5e09f6c29ac895 Reviewed-on: https://code.wireshark.org/review/1326 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Improve Instance ID LCAF type handlingLorand Jakab1-19/+95
Change-Id: I66b1f4746b67ff88c56c4127647c4baa2d504a93 Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/1325 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix warning: declaration of 'address' shadows a global declaration.AndersBroman1-4/+4
Change-Id: I0be594aca0e8fac3c55492f6c168b0b8c13e63e5 Reviewed-on: https://code.wireshark.org/review/1324 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Add support for Geo Coordinates LCAF typeLorand Jakab1-12/+253
Additionally, improve the way LCAF top-level tree item shows details from the information gathered later, including for AFI List LCAF types. For someone interested just in the summary from an LCAF type, this can save one or two clicks opening subrees. Change-Id: I40ea05ddf922bcb2a2a934f5e791f87133ca32cc Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/1323 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Adding two well known OAM related multicast address ranges.Jaap Keuter1-0/+2
Change-Id: I8fb840e7422b5fe7cd3072d8332de659598ebd3d Reviewed-on: https://code.wireshark.org/review/1313 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix packet-ospf.c:1181:33: warning: code will never be executed ↵Alexis La Goutte1-2/+0
[-Wunreachable-code] found by Clang with extra compiler flags Change-Id: I6a923d85cb5cc947a7e96c1845bde72059d92118 Reviewed-on: https://code.wireshark.org/review/1322 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix packet-netlink-sock_diag.c:653:4: warning: code will never be executed ↵Alexis La Goutte1-1/+0
[-Wunreachable-code] found by Clang with extra compiler flags Change-Id: Ie3917cee669cfe71f0967e132dd73145a55f0aad Reviewed-on: https://code.wireshark.org/review/1321 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix packet-ospf.c:1181:33: warning: code will never be executed ↵Alexis La Goutte1-1/+0
[-Wunreachable-code] found by Clang with extra compiler flags Change-Id: Ia08e01eee4b0829074f65d50c6ba51ef32dc64b9 Reviewed-on: https://code.wireshark.org/review/1320 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix warning: extra ‘;’ [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: Ib2f52d28dce0f64bf56ff0df7b4ed7d091670620 Reviewed-on: https://code.wireshark.org/review/1319 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-24Fix Warning: Found soft-deprecated APIs in epan/dissectors/packet-lisp.c: ↵Alexis La Goutte1-4/+4
tvb_length and also fix warning found by fix-encodings-args Change-Id: I20193d9f2700e8ede439dcc848390ff7672239b3 Reviewed-on: https://code.wireshark.org/review/1318 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-24Fix counting/ checking for leap years in mktime_utc()Jakub Zawadzki1-4/+9
When HAVE_TIMEGM is undefined mktime_utc() might output one day shift (+86400s) for (years <= 1967 or years >= 2100) && month >= 3 { .tm_mday = 1 .tm_mon = 2 .tm_year = 67 } mktime_utc() = -89436590 // Thu Mar 2 00:00:00 UTC 1967 gmtime() = -89596800 // Wed Mar 1 00:00:00 UTC 1967 { .tm_mday = 1 .tm_mon = 2 .tm_year = 200 } mktime_utc() = 4107628800 // Tue Mar 2 00:00:00 UTC 2100 gmtime() = 4107542400 // Mon Mar 1 00:00:00 UTC 2100 Change-Id: I1a544762fa5178c8798496d7dc30a2e767919149 Reviewed-on: https://code.wireshark.org/review/1287 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Improve LCAF handlingLorand Jakab1-55/+130
Also, remove some more proto_tree_add_text() occurrences. Change-Id: Ie46e16308b95f190229c22d06c5235ea3464394a Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu> Reviewed-on: https://code.wireshark.org/review/1317 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24JXTA: ask for one more segment, not one more byteEvan Huus1-1/+1
Otherwise we end up doing reassembly of long messages one painful byte at a time even when all of those bytes are in the same TCP payload. This results in ridiculous memory usage. Change-Id: Ie28d5ade1fec54e6ebc225341582270651d7371c Closes-Bug: 10018 Reviewed-on: https://code.wireshark.org/review/1312 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-24Revert "Move kerberos to dirty list in CMake"Evan Huus1-1/+1
it no longer has any warnings This reverts commit 30c9f421c024266d0fd6a9d981f28b83d8b363ba. Change-Id: I5cc71f905ffa4f00ffb44ad7d03b2684c2e44e38 Reviewed-on: https://code.wireshark.org/review/1316 Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 03:42:20 +0000