Commit Graph

19375 Commits

Author SHA1 Message Date
Pascal Quantin a4c1a7c476 Revert r54510: OSX buildbots still complain about unused hf variables
svn path=/trunk/; revision=54515
2013-12-31 17:19:43 +00:00
Martin Kaiser 729e8a2885 move packet-tango.c from dirty to clean
svn path=/trunk/; revision=54510
2013-12-31 14:48:48 +00:00
Martin Kaiser 43e892e985 From Dirk
dissector for Novell's PKIS certificate extensions

from me
clean up the $Id$ tags
remove packet-pkis(-template).h
remove ASN.1 definitions that cause compiler warnings
   (OID, SecurityLabelType2)
move the dissector to the clean ASN.1 dissectors
support CMake build
change the name to novell_pkis

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

svn path=/trunk/; revision=54508
2013-12-31 14:20:08 +00:00
Martin Kaiser fc15329e6a add some more box names
svn path=/trunk/; revision=54507
2013-12-31 13:09:52 +00:00
Martin Mathieson 2719103661 Zero security struct to avoid reading garbage value, and remove a redundant test
svn path=/trunk/; revision=54506
2013-12-31 00:46:53 +00:00
Guy Harris 53cba3e3b9 Add an "ATM reassembly failed" flag for capture file readers to provide,
and set it in NetXRay/Windows Sniffer files if the putative "ATM
reassembly failed" flag is set and, if reassembly failed, don't attempt
to dissect the packet.

svn path=/trunk/; revision=54503
2013-12-30 23:37:12 +00:00
Guy Harris 1c9b36ad46 gcamel_StatSRT is set by the CLI CAMEL tap, so it can't be static.
svn path=/trunk/; revision=54502
2013-12-30 22:31:04 +00:00
Michael Mann 58346b6327 Move tcap and camel "persistent data" functionality to the dissectors themselves instead of being part of epan directory.
svn path=/trunk/; revision=54499
2013-12-30 22:07:38 +00:00
Guy Harris 94387fdcbd If we don't have libgcrypt, have a stub zbee_sec_ccm_decrypt() routine
that always returns FALSE, meaning "can't decrypt".

Should fix bug 9608.

We already declare zbee_sec_ccm_decrypt() in a header file, so don't
declare it in the source file.

svn path=/trunk/; revision=54498
2013-12-30 21:03:43 +00:00
Pascal Quantin 3490faec34 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9286 :
PLMN 440 20 is now used by SoftBank.
While we are at it, update the E.212 list to the latest operational bulletin no. 1041.

svn path=/trunk/; revision=54496
2013-12-30 12:26:03 +00:00
Bill Meier f7208c8562 Don't use 'l' as a constant modifier:
Define NTP_BASETIME as an unsigned [int] constant;

Also:
 Add editor modelines;
 Create/use an extended value-string;
 Use casts to time_t consistently;
 'offset++' --> 'offset += 1'
 Adjust some whitespace.

svn path=/trunk/; revision=54493
2013-12-30 01:47:51 +00:00
Guy Harris 87328505f0 Replace a global variable used only for its size with a #define for the
size; this eliminates a global variable and also eliminates some
compiler warnings on LP64 platforms.

svn path=/trunk/; revision=54491
2013-12-29 23:09:12 +00:00
Bill Meier 756457682d From robionekenobi: packet-mq enhancement
Add new Structure dissection
 Fix some small issues
 Reformat some part of code
 use spaces instead of tabs for indentation

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

From me:
 Remove some trailing whitespace;
 Change a few tabs to spaces;
 Change editor-modelines tab-width, etc to 8 (altho
   not really relevant since tabs not being used).

svn path=/trunk/; revision=54489
2013-12-29 20:58:27 +00:00
Martin Kaiser 745c8660be From stcook
clear the temporary buffer after each DXM channel data line

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

svn path=/trunk/; revision=54488
2013-12-29 18:45:09 +00:00
Jakub Zawadzki 2693738f49 Set svn:keywords and svn:eol-style properties.
svn path=/trunk/; revision=54484
2013-12-29 16:00:26 +00:00
Michael Mann 57a62f7a4d New dissector for the CCSDS CFDP protocol. Bug 9517 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9517)
From Juan Antonio

svn path=/trunk/; revision=54482
2013-12-29 15:28:49 +00:00
Gerald Combs f01ee8af9f [Automatic manuf, services and enterprise-numbers update for 2013-12-29]
svn path=/trunk/; revision=54480
2013-12-29 15:03:50 +00:00
Michael Mann d3ed64d8e3 Add ZigBee Green Power dissector. Bug 9424 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9424)
From DSR Corporation

svn path=/trunk/; revision=54478
2013-12-28 12:26:37 +00:00
Jakub Zawadzki d6b35d5c6b mp2t: return offset when dissecting AF (continuation of r54396)
svn path=/trunk/; revision=54476
2013-12-27 17:42:46 +00:00
Anders Broman d0915cabb3 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54473
2013-12-27 10:49:35 +00:00
Evan Huus 31954c98ee From Robert Jongbloed via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8355

Support RTP/RTCP multiplexing. With input from Jonathan Lennox.

svn path=/trunk/; revision=54469
2013-12-26 21:35:20 +00:00
Michael Mann 29f61a9deb Add numeric types instead of string where possible in the RTPproxy dissector. Bug 9561 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9561)
From Peter Lemenkov

svn path=/trunk/; revision=54467
2013-12-26 15:42:06 +00:00
Michael Mann f563d1d4f8 ZigBee Test Profile #2 and ZDP fixes. Bug 9584 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9584)
From DSR Corporation

svn path=/trunk/; revision=54466
2013-12-26 15:08:18 +00:00
Michael Mann 60b1c30382 Bugfix attribute id parsing in zbee dissectors. Bug 9566 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9566)
From Fabio Tarabelloni

svn path=/trunk/; revision=54465
2013-12-26 14:28:22 +00:00
Evan Huus a2abd0eef4 Protect ucp_mktime against too-short input strings, as caught by Alexis'
ASAN-fuzzing.

svn path=/trunk/; revision=54464
2013-12-26 14:12:50 +00:00
Michael Mann 6697a94ba5 "Better" fix for OpenSafety heuristics with Modbus/TCP. Bug 9572 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9572)
From Roland Knall

This fix is on top of/in conjunction with r54193 and both need to be backported.

svn path=/trunk/; revision=54463
2013-12-26 14:10:26 +00:00
Evan Huus 441ebf8cc8 Use the correct define for the array length check, actually fixes the overflow I
originall tried to fix in r54441.

svn path=/trunk/; revision=54462
2013-12-26 14:01:37 +00:00
Alexis La Goutte e79f82dc9f Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54458
2013-12-26 10:00:36 +00:00
Alexis La Goutte c39b9e7db5 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54457
2013-12-26 09:54:31 +00:00
Alexis La Goutte 766d4438f2 Fix -Wunused-const-variable found by Clang
svn path=/trunk/; revision=54456
2013-12-26 09:54:22 +00:00
Alexis La Goutte 00fb8f078a From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9595
Small changes (mainly textual) to packet-scsi.c

The attached patch fixes small issues in SCSI dissection:
1. Extends the meaning of some fields (for example, the mysterious 'LBPME' becomes 'LBPME (logical block provisioning management enabled) / TPE'
2. Adds another ASC value which is important to me - 'Thin Provisioning Soft Threshold Reached' . Added comment where to get all of them (at  http://www.t10.org/lists/asc-alph.txt or http://www.t10.org/lists/asc-num.txt)
3. Fixes a small typo: scsi.extcopy.dest_lba is 'Destination LBA', not 'Source LBA' (silly copy-paste mistake).

svn path=/trunk/; revision=54455
2013-12-26 09:54:12 +00:00
Guy Harris c0823e1977 OmniPeek's dissection nonwitstanding, the timestamp field in the
PeekRemote packets from Cisco appears to be a 64-bit timestamp; it's
probably the Time Synchronization Function timestamp (TSFT), so call it
that.

svn path=/trunk/; revision=54453
2013-12-25 23:03:12 +00:00
Guy Harris 189debcadb Code that uses that parameter is #if 0'ed out, so _U_ it for now.
svn path=/trunk/; revision=54452
2013-12-25 09:23:33 +00:00
Martin Mathieson 21f8c1fb7b Show ciphering and integrity keys separately. Correct inputs to integrity calculation (result still not right with gcrypt 1.6 yet)
svn path=/trunk/; revision=54451
2013-12-25 08:44:43 +00:00
Michael Mann e44ebaa9de Use expert info instead of proto_tree_add_text.
svn path=/trunk/; revision=54450
2013-12-25 03:48:20 +00:00
Michael Mann 6535f89772 Make many fields filterable. Used convert_proto_tree_add_text.pl to do a "first pass" at converting proto_tree_add_text calls since this dissector is the worse (ab)user (by volume) of proto_tree_add_text and the "coding style" is very conducive to having convert_proto_tree_add_text.pl correctly guessing the field info.
Another pass or two of convert_proto_tree_add_text.pl (with more manual intervention) is needed to be a "proper" dissector, but it gets it off of the checkAPIs.pl "naughty list" in time for Christmas.

svn path=/trunk/; revision=54449
2013-12-24 23:41:24 +00:00
Alexis La Goutte 68e7ccc5dc From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

rename and remove some variables

svn path=/trunk/; revision=54446
2013-12-24 15:16:02 +00:00
Alexis La Goutte 46d0f09bf5 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

free all gcrypt resources

svn path=/trunk/; revision=54445
2013-12-24 15:15:52 +00:00
Alexis La Goutte ee6d040ebf From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

free all gcrypt resources

svn path=/trunk/; revision=54444
2013-12-24 15:15:43 +00:00
Alexis La Goutte ad5d1b9105 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

initialize all variables

svn path=/trunk/; revision=54443
2013-12-24 15:15:29 +00:00
Alexis La Goutte 7c5dc6d566 From Dirk via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9589
Enhance SSL dissector : fix ssl_private_decrypt()

remove unused functions and a #define

svn path=/trunk/; revision=54442
2013-12-24 15:15:17 +00:00
Evan Huus 36587bc7be Avoid accessing past the end of an array.
svn path=/trunk/; revision=54441
2013-12-24 14:34:06 +00:00
Martin Kaiser d6b1e2e95c use https instead of http in the url when the packet contains ssl
svn path=/trunk/; revision=54440
2013-12-24 13:53:09 +00:00
Martin Kaiser 7708c2a19f dirty hack to make things compile without libgcrypt
would it make sense to check global_pdcp_check_integrity inside
calculate_digest()?

svn path=/trunk/; revision=54438
2013-12-24 13:38:32 +00:00
Martin Mathieson 8cbcfcf6a4 Lop off last 4 bytes of payload to use for digest calculation. Still doesn't get expected result.
svn path=/trunk/; revision=54437
2013-12-24 07:24:39 +00:00
Evan Huus 0ea5c80e1a Replace an ep-stack with a wmem stack. Running epan_init() no longer uses
any ephemeral memory.

svn path=/trunk/; revision=54434
2013-12-24 01:38:26 +00:00
Guy Harris edb6cf0b16 Get rid of no-longer-used variables.
svn path=/trunk/; revision=54433
2013-12-24 01:30:00 +00:00
Guy Harris 0d7a48a8bf Add a ENC_3GPP_TS_23_038 encoding, for the standard SMS alphabet in a
bit-packed string, and use it in some places.

svn path=/trunk/; revision=54428
2013-12-24 00:20:09 +00:00
Martin Mathieson 57c6542aaf Still not quite working, but using MAC API with gcrypt 1.6 now for digest
svn path=/trunk/; revision=54427
2013-12-24 00:09:41 +00:00
Guy Harris b71b269a23 Fix setup of new expert info item.
svn path=/trunk/; revision=54426
2013-12-23 22:05:23 +00:00