Commit Graph

21926 Commits

Author SHA1 Message Date
Graeme Lunt 3d19c5130b Fix for OSX gremlin in PKCS12 template.
svn path=/trunk/; revision=22537
2007-08-17 19:23:15 +00:00
Graeme Lunt 4d708c7260 Faked BMP string display.
svn path=/trunk/; revision=22536
2007-08-17 19:16:51 +00:00
Graeme Lunt 0e9f4f05f1 Support for the decryption of EncryptedData which is used by PKCS12
Uses the PBE routines from PKCS12.


svn path=/trunk/; revision=22535
2007-08-17 19:14:39 +00:00
Graeme Lunt 54aa46c2bb Support for decrypting of PKCS#12 bag contents.
Supports RC2, RC4 and 3DES with SHA1 Password-based Encryption using libgcrypt functions.
Password is provided as a preference, as is trying to decode with a empty/NULL password. 


svn path=/trunk/; revision=22534
2007-08-17 18:52:40 +00:00
Sake Blok 47ec0bead9 (http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1717)
This patch adds support for the Juniper NetScreen snoop output format. 
It takes a text-dump op the captured packets and parses the headers 
and hex-data. Since the snoop files on a Junpiper NetScreen can be saved 
to a tftp-server, this patch makes it quite easy to use the snoop 
function of the Juniper NetScreen firewalls.

/* XXX TODO:
 *
 * o  Create a wiki-page with instruction on how to make tracefiles
 *    on Juniper NetScreen devices. Also put a few examples up
 *    on the wiki (Done: wiki-page added 2007-08-03)
 *
 * o  Use the interface names to properly detect the encapsulation
 *    type (ie adsl packets are now not properly dissected)
 *    (Done: adsl packets are now correctly seen as PPP, 2007-08-03)
 *
 * o  Pass the interface names and the traffic direction to either
 *    the frame-structure, a pseudo-header or use PPI. This needs
 *    to be discussed on the dev-list first
 *    (Posted a message to wireshark-dev abou this 2007-08-03)
 *
 */


svn path=/trunk/; revision=22533
2007-08-17 08:03:32 +00:00
Ulf Lamping 2efdf99f28 mark some parameters as unused
svn path=/trunk/; revision=22532
2007-08-16 23:35:28 +00:00
Ulf Lamping 3a0c285065 fix return types, hopefully this will make the osx buildbot happy
svn path=/trunk/; revision=22531
2007-08-16 22:45:36 +00:00
Ulf Lamping 4b215597ae experimental feature: dissector filters
add the possibility, that a dissector writer can provide (usually non-trivial) display filters specific for the protocol in question (with an example in packet-dcerpc-pn-io.c), that will appear in the GUI


svn path=/trunk/; revision=22530
2007-08-16 22:03:10 +00:00
Stig Bjørlykke 1ac635cd7d When calculating checksum for p_mul the checksum field itself is set to zero.
Ensure this field is inside the buffer before altering it, so we don't 
write outside the allocated buffer.

svn path=/trunk/; revision=22529
2007-08-16 20:54:43 +00:00
Anders Broman 8d76d4130e Collect context data.
svn path=/trunk/; revision=22528
2007-08-16 19:59:55 +00:00
Stig Bjørlykke 138d737a47 Added handling of ISO FTAM unstructured binary, as this OID is used in
X.420 FileTransferBodyPart for generic binary bodyparts.
Also added handling of ISO FTAM unstructured text.

svn path=/trunk/; revision=22527
2007-08-16 17:59:27 +00:00
Ulf Lamping 6ad79ef80c finish the expert info section
svn path=/trunk/; revision=22526
2007-08-16 15:53:35 +00:00
Anders Broman 246d0c1e84 Fix makefiles and a comment.
svn path=/trunk/; revision=22525
2007-08-16 07:00:50 +00:00
Luis Ontanon b782333f20 - It's just-a-bad-idea(tm) to redefine anything from a foreign library, Don't.
- Allow to look for value-types by name.

[still largelly  untested]

svn path=/trunk/; revision=22524
2007-08-16 06:48:51 +00:00
Ulf Lamping 696e992a8c fix build problems under Win32
svn path=/trunk/; revision=22523
2007-08-16 04:54:30 +00:00
Ulf Lamping 5e113ab7ce some more editing of the expert infos - still incomplete
svn path=/trunk/; revision=22522
2007-08-16 04:32:48 +00:00
Ulf Lamping cc8f5e8f60 add an expert info, if ip.ttl < 5
svn path=/trunk/; revision=22521
2007-08-16 04:25:54 +00:00
Stephen Fisher 7bef902e14 Initial work on merging common code between follow TCP & SSL stream features
svn path=/trunk/; revision=22520
2007-08-16 03:36:38 +00:00
Stig Bjørlykke 6a751ffd2e Regenerate the CDT dissector with -X and -T options.
svn path=/trunk/; revision=22519
2007-08-15 23:42:29 +00:00
Jeff Morriss ffec5b8896 Convert a couple tvb_get_string()'s into tvb_get_ephemeral_string(). In the one remaining use of tvb_get_string(), g_free the old entry if the pointer is *not* NULL.
svn path=/trunk/; revision=22518
2007-08-15 22:41:49 +00:00
Stig Bjørlykke 93a9ea7879 Improved dumping of unexpected data when dissector for OID not implemented.
svn path=/trunk/; revision=22517
2007-08-15 22:34:56 +00:00
Stig Bjørlykke a29b4bf19e Added support for RFC3030 (BDAT) in SMTP.
Added data fragment length to COL_INFO.
Changed some 0/1 values to boolean.

http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1736

svn path=/trunk/; revision=22516
2007-08-15 22:29:58 +00:00
Jeff Morriss 3dec62b85c - s/ntohs/g_ntohs
- s/ntohl/g_ntohl
- s/free/g_free
- Change some tvb_get_string()+g_free()'s into tvb_get_ephemeral_string()
- Change some tvb_fake_unicode()+g_free()'s into tvb_get_ephemeral_faked_unicode()
- Change some tvb_get_string() calls that were clearly memory leaks (like
  atoi(tvb_get_string(...))) into tvb_get_ephemeral_string()

svn path=/trunk/; revision=22515
2007-08-15 22:27:52 +00:00
Stig Bjørlykke 0cab42b465 Use fragment_start_seq_check to start defragmentation when receiving an
Address PDU without adding a empty message fragment.

svn path=/trunk/; revision=22514
2007-08-15 22:26:00 +00:00
Stig Bjørlykke c6ba6d714d Added fragment_start_seq_check to start a reassembly without adding any data.
svn path=/trunk/; revision=22513
2007-08-15 22:24:05 +00:00
Stig Bjørlykke 84e7d8ca70 Fixed a free -> g_free
Removed a unused hf_ entry

From Ian Brumby:
- Fixed decoding of 4 character and longer SICs

svn path=/trunk/; revision=22512
2007-08-15 22:20:28 +00:00
Jeff Morriss 37b786a771 Change tvb_get_string() to tvb_get_ephemeral_string(). Since we weren't freeing the returned buffer, this cleans up a memory leak. NOTE: I had to manually regenerate this dissector without the "-T" option to avoid checking in a lot of changes that I don't understand/didn't make. Why is the Makefile newer than what's in epan/dissectors/ ?
svn path=/trunk/; revision=22511
2007-08-15 21:37:09 +00:00
Jeff Morriss ced84236fe checkhf.pl found a couple bugs: hf_sccp_calling_itu_global_title_indicator and hf_sccp_ansi_isni_counter were never used (the former due to a typo, the latter due to oversight).
svn path=/trunk/; revision=22510
2007-08-15 21:07:01 +00:00
Jeff Morriss 58b8fef9ea As discussed on the -dev list quite a while ago: a small tool to check Wireshark code (or at least parts of it) for "bad" things (C++ style comments and API/function calls that should not be used). I'm checking in because I almost missed some C++ style comments in a file I was contemplating checking in; this tool can help us (at least me) avoid such problems in the future.
svn path=/trunk/; revision=22509
2007-08-15 20:35:14 +00:00
Luis Ontanon 05bdebe45d I'm at the end of the second iteration, so far this compiles OK still haven't tested it but it does not go in the Makefiles, I need this as a reference point.
svn path=/trunk/; revision=22508
2007-08-15 19:52:44 +00:00
Jörg Mayer 4793614e27 Mask out only the bc/mc bit, not the locally assigned bit.
Update comment accordingly.

svn path=/trunk/; revision=22507
2007-08-15 13:21:23 +00:00
Ulf Lamping e883e94f8a don't use table names twice
svn path=/trunk/; revision=22506
2007-08-15 07:37:23 +00:00
Anders Broman d2e37e0fef Change tcap_private to ansi_tcap_private.
svn path=/trunk/; revision=22505
2007-08-15 05:47:17 +00:00
Ulf Lamping 34ad22678b add a section about expert infos
svn path=/trunk/; revision=22504
2007-08-15 01:35:05 +00:00
Ulf Lamping 60e81cd141 if the manuf address could not be resolved, strip off special bits (multicast, locally administered) and try again to find it
svn path=/trunk/; revision=22503
2007-08-14 23:52:51 +00:00
Anders Broman 211ad2e696 Actually adding the dissector may help :)
svn path=/trunk/; revision=22502
2007-08-14 22:10:55 +00:00
Anders Broman 1518d1b07a Preparations to split the TCAP dissector into ANSI and ITU parts.
svn path=/trunk/; revision=22501
2007-08-14 22:05:36 +00:00
Anders Broman ab242d50fa From From: Sommars, Steven E:
Minor problem in packet-gtp.c  when decoding the PDP context Information
Element (7.7.29 in 29.060)   The two uplink TEIDs are reversed in
packet-gtp.c, it should be control plane, followed by data.

Reworked the patch.

svn path=/trunk/; revision=22500
2007-08-14 21:50:12 +00:00
Jaap Keuter e3af953ae2 From Nicolas Dichtel:
Please find enclosed a patch to update BA status code for PMIPv6
according to draft-ietf-netlmm-proxymip6-01 Section 8.5

svn path=/trunk/; revision=22499
2007-08-14 16:37:35 +00:00
Anders Broman 2bcdc1570a Update the makefile
svn path=/trunk/; revision=22498
2007-08-14 06:20:54 +00:00
Anders Broman ba7b62649a Add files for ANSI TCAP.
svn path=/trunk/; revision=22497
2007-08-14 06:14:31 +00:00
Anders Broman 4b6cfd0f16 Add the original TCAP ASN1 files.
svn path=/trunk/; revision=22496
2007-08-14 06:03:52 +00:00
Martin Mathieson d5b50f6f82 Add etsie2e4.xml to Makefile.am
svn path=/trunk/; revision=22495
2007-08-13 21:17:02 +00:00
Anders Broman 26f1fbcb12 Register by name.(Add the template file as well).
svn path=/trunk/; revision=22493
2007-08-13 16:44:35 +00:00
Anders Broman 57592cb2aa http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1739
Fro Stig Bjørlykke:
1. BER: Added support for empty indef SET
2. RTSE: Added fragment length in COL_INFO
3. IMF: Use correct hf_id for extension value
4. DOP: Fix typo in COL_INFO oid name

svn path=/trunk/; revision=22492
2007-08-13 16:41:16 +00:00
Anders Broman e5d21a06fa Add forgotten header field.
svn path=/trunk/; revision=22491
2007-08-13 16:28:13 +00:00
Tomas Kukosa 396ceb5607 NBAP rewritten to use original ASN.1 source and updated to TS 25.433 V7.5.0 (2007-06)
svn path=/trunk/; revision=22490
2007-08-13 11:15:39 +00:00
Ulf Lamping bd402b4d16 fix a typo
svn path=/trunk/; revision=22489
2007-08-12 23:38:09 +00:00
Ulf Lamping b2cba56d8c as noted by Stig Bjørlykke: Also adding "services" to pkgdata_DATA will install the services file correctly.
svn path=/trunk/; revision=22488
2007-08-12 21:46:50 +00:00
Ulf Lamping 0a4e09493a add IANA port-numbers file as a file named "services", with some minor explanations from me at the top of that file
add it to the distributed files, to the Win32 NSIS and U3 packages. UNIX packages will still miss this (optional) file.

svn path=/trunk/; revision=22487
2007-08-12 20:54:30 +00:00