Commit Graph

196 Commits

Author SHA1 Message Date
Jörg Mayer 93f5beda89 Warning fixes
svn path=/trunk/; revision=22629
2007-08-24 10:20:22 +00:00
Jörg Mayer 733f78043e The ber header was missing from the object, resulting in
invalid saved certificates.

svn path=/trunk/; revision=22628
2007-08-24 08:12:39 +00:00
Jörg Mayer b312e64f6a get_ber_length doesn't need the tree argument, get rid of it.
Rebuild asn1 dissectors.

svn path=/trunk/; revision=22627
2007-08-24 07:12:04 +00:00
Graeme Lunt d36abc4549 Handle unknown Universal and BMP strings.
svn path=/trunk/; revision=22551
2007-08-18 17:39:44 +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
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
Tomas Kukosa b104611590 remove unused variable
svn path=/trunk/; revision=22407
2007-07-26 14:31:38 +00:00
Tomas Kukosa 82ea2908f1 - export some ASN.1 functions from libwireshark
- fill-in actx->created_item in dissect_ber_object_identifier()

svn path=/trunk/; revision=22406
2007-07-26 14:00:48 +00:00
Tomas Kukosa 6659588f60 - get rid of anonymous unions
- move some structures from packet-per and packet-q932-ros to asn1.h

svn path=/trunk/; revision=22295
2007-07-13 11:25:53 +00:00
Anders Broman 379d320b8b From Stig Bjørlykke:
This patch adds an option to packet-ber to show unexpected tags/data as unknown BER.  It also fixes some offset/length combinations when adding the error message to the tree.

svn path=/trunk/; revision=22244
2007-07-05 13:14:25 +00:00
Anders Broman 442538ce0b Fix a typo.
svn path=/trunk/; revision=22171
2007-06-23 15:31:37 +00:00
Anders Broman 9af02b5130 Change actx->external.direct_reference to be the OID string.
Use it in BER direct reference to call the OID dissector.

svn path=/trunk/; revision=22097
2007-06-14 05:17:07 +00:00
Stephen Fisher bcfc3b9468 Get the Unix buildbots going again
svn path=/trunk/; revision=22086
2007-06-13 06:22:43 +00:00
Anders Broman 58f01d87cc Preparations for updated CMIP dissector:
- Export AE-title from ACSE
- Start REAL dissection(unfinished).

svn path=/trunk/; revision=22083
2007-06-12 21:29:27 +00:00
Anders Broman 5a2fb14332 Add some opcodes and mark func as _U_ in packet-ber.c
svn path=/trunk/; revision=22032
2007-06-03 21:10:29 +00:00
Anders Broman 4393bceae5 INAP:
- Use (some) IN CS4 asn1 files Q.1248.1 Q.1248.2 Q.1248.3

BER/asn2wrs:
-  Add basic support for EmbeddedPDVType

svn path=/trunk/; revision=22031
2007-06-03 19:58:59 +00:00
Anders Broman d197031761 Change implicit tag handling for SEQUENCE OF and fix a cut'n paste error.
svn path=/trunk/; revision=22006
2007-05-30 19:00:50 +00:00
Anders Broman ddb6768db2 Update the EXTERNAL dissection code(still unfinished).
svn path=/trunk/; revision=21893
2007-05-22 21:15:00 +00:00
Anders Broman dca634c4de Prepare for the use of the new -X parameter for BER encoded protocols.
svn path=/trunk/; revision=21889
2007-05-22 16:17:54 +00:00
Anders Broman f08cd1e5e3 actx in the rest of dissect_ber..()l
svn path=/trunk/; revision=21773
2007-05-15 05:49:43 +00:00
Ronnie Sahlberg fc5ce01ee4 replace an incorrect '{' with ';' in the ber header file
change the signature for dissect_ber_external_type() to only provide the 
parameter actx once


svn path=/trunk/; revision=21756
2007-05-13 22:19:04 +00:00
Anders Broman 0bc558f88d actx in ber_external
svn path=/trunk/; revision=21755
2007-05-13 22:01:17 +00:00
Anders Broman 0a0a913a01 Try to make the buildbot happy.
svn path=/trunk/; revision=21754
2007-05-13 21:54:45 +00:00
Anders Broman c01f382974 Second step in introducing asn context to BER dissectors just like in PER.
svn path=/trunk/; revision=21753
2007-05-13 20:58:29 +00:00
Anders Broman fd108518ed _U_ mark some parameters and a forgotten file.
svn path=/trunk/; revision=21706
2007-05-07 05:35:45 +00:00
Anders Broman 4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
Graeme Lunt 2e96e3fe55 Separate field for the elements of a constructed OCTET STRING.
svn path=/trunk/; revision=21695
2007-05-06 08:18:44 +00:00
Anders Broman 334177b096 Show BER internal fields in external type in ACSE, update a comment in packet-ber.c.
svn path=/trunk/; revision=21685
2007-05-04 20:27:43 +00:00
Guy Harris 2447ba1de6 Once is enough. :-)
That should get rid of warnings in packet-ber.c; add it to the list of
clean dissectors, to try to keep it clean.

svn path=/trunk/; revision=21684
2007-05-04 18:56:59 +00:00
Anders Broman 98cb9db12d Split out asn1 common functions. Start of BER EXTERNAL.
svn path=/trunk/; revision=21670
2007-05-03 21:52:57 +00:00
Anders Broman fdb44d8bb4 Show internal ber fields for tagged type if pref. set.
svn path=/trunk/; revision=21668
2007-05-03 19:56:13 +00:00
Luis Ontanon 49e49452dd fix warnings in debug code
svn path=/trunk/; revision=21652
2007-05-02 20:37:25 +00:00
Anders Broman 83f17c25a7 Revert some private experiments checked in by misstake.
svn path=/trunk/; revision=21609
2007-04-28 14:47:43 +00:00
Anders Broman 2630b817b0 From Gavin Heer:
Here's a patch that decodes MMS(Manufacturing Messaging
Specification) when transported over COTP/TPKT/TCP.  Previously, MMS would only be decoded if the OSI Presentation Layers were present. Now MMS/COTP/TPKT/TCP is dissected.
With a change to use more functions from packet-ber

svn path=/trunk/; revision=21608
2007-04-28 14:38:53 +00:00
Guy Harris f010b46419 decode_as_dt's argument points to a dissector table name, so it should be
a const pointer.

svn path=/trunk/; revision=21529
2007-04-23 16:49:24 +00:00
Guy Harris 1bc049906a Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.

If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.

Constify a bunch of stuff, and make some other changes, to get rid of
warnings.

Clean up some indentation.

svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
Guy Harris c5beaef29e "call_ber_syntax_callback()" isn't used outside packet-ber.c, isn't
declared in any header file, and isn't in epan/libwireshark.def; make it
static, to squelch compiler warnings.

svn path=/trunk/; revision=21518
2007-04-23 00:32:04 +00:00
Anders Broman 5954b97ac4 Add EXTERNAL to the value string and add comments about UNIVERSAL tags.
svn path=/trunk/; revision=21479
2007-04-20 13:54:56 +00:00
Jeff Morriss 00cf2ec89c Frame numbers are unsigned, print them as such
svn path=/trunk/; revision=21443
2007-04-16 04:52:51 +00:00
Ronnie Sahlberg d5d5159b6d From Sebastien Tandel
fixes for various compiler warnings

svn path=/trunk/; revision=21210
2007-03-26 11:06:26 +00:00
Anders Broman ecbf96d04e From Stig Bjørlykke:
When dumping elements in a constructor in dissect_unknown_ber the last element is not put in the correct subtree, because the while- loop does not include the header length when checking for the end.

svn path=/trunk/; revision=20984
2007-03-06 21:03:27 +00:00
Bill Meier 103bf29730 Continuing the tradition: squelch some compiler warnings ....
svn path=/trunk/; revision=20866
2007-02-19 22:29:23 +00:00
Graeme Lunt 38515fbf22 From X.690 8.6.2.3
"If the bitstring is empty, there shall be no subsequent octets, and the initial octet shall be zero." 

The BER dissector marked empty bitstrings as "Padding", but they are now marked as "Empty". 

http://www.wireshark.org/lists/wireshark-dev/200702/msg00574.html


svn path=/trunk/; revision=20834
2007-02-17 14:23:09 +00:00
Graeme Lunt c09afc2db6 This patch adds some new features to the BER dissector:
- Added option to decode OCTET STRINGs as BER encoded data
- Added decoding of unknown VisibleString and GeneralString
- Some code cleanup

http://www.wireshark.org/lists/wireshark-dev/200702/msg00482.html


svn path=/trunk/; revision=20831
2007-02-17 11:10:02 +00:00
Graeme Lunt 74fa87ddb2 Small fix for incorrect column use when dissecting a BER file.
svn path=/trunk/; revision=20709
2007-02-04 12:00:25 +00:00
Anders Broman c16c8a9bee From Graeme Lunt:
The problem was that when dissecting the set, if a sub-dissector didn't consume any bytes it was assumed that the correct field hadn't been matched.
This fix matches the field if the sub-dissector consumes no bytes and we know that the length of the field is zero. This is only allowed on the first pass when we are not matching ANYs.
I think this is a fairly safe fix - I've tried it with some other ASN.1

I've also changed dissect_ber_octet_string() to show the zero length fields in the dissection. This shows the fields as "<MISSING>" which is not quite the right explanation as the field is definitely present. Something like "<EMPTY>" or "<ZERO LENGTH>" may be better - but I'm not sure of the reasoning behind "<MISSING>".

svn path=/trunk/; revision=20429
2007-01-14 20:54:39 +00:00
Graeme Lunt 7d3a4e9264 New protocol dissector for PKCS#12 - Personal Information Exchange Syntax.
Generally found within a file (.p12 or .pfx) or as a directory attribute (userPKCS12 from iNetOrgPerson).

Wiki page and sample file to follow.


svn path=/trunk/; revision=20416
2007-01-13 15:26:13 +00:00
Graeme Lunt 2fd7d2c620 New "decode as ..." feature for BER-encoded files (WTAP_FILE_BER).
A BER-encoded file can be dissected as one of a number of registered syntaxes (registered using register_ber_syntax_dissector()). 
Syntaxes may also be associated with OIDs (or other strings) using register_ber_oid_syntax(). 

A default syntax with which to dissect a BER-encoded file is determined from its filename (extension). For example, ".cer" and ".crt" files will be dissected as "Certificate".


svn path=/trunk/; revision=20414
2007-01-13 12:59:27 +00:00
Anders Broman c9bbf1b510 Packet-ber:
Handle the following type of construct
CDMATargetMAHOInformation ::= SEQUENCE {
	targetCellID			[3] IMPLICIT TargetCellID,
	cdmaPilotStrength		[65] IMPLICIT CDMAPilotStrength,
	cdmaTargetOneWayDelay	[61] IMPLICIT CDMATargetOneWayDelay
	}

CDMATargetMAHOList ::= SEQUENCE OF [135] IMPLICIT CDMATargetMAHOInformation

ansi_map:
- Correct an Enummeration
- add Missing OPTIONAL to Tags
- Handle parameter if it's one or two octets long.

svn path=/trunk/; revision=20386
2007-01-10 22:59:40 +00:00
Anders Broman fda137ce6a Fix tag > 0x1f
svn path=/trunk/; revision=20333
2007-01-06 20:21:30 +00:00