aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
AgeCommit message (Collapse)AuthorFilesLines
2014-04-03Fix Bug 9920 Buildbot crash due to SDP/RTP mismatchHadriel Kaplan1-9/+3
For details see comments in Bug 9920. The executive summary: Bug 9920 is a crash caused by a couple of issues: 1) The memory ownership model for the rtp_dyn_payload hashtable is split: SDP creates the rtp_dyn_payload hashtable, but RTP can free it. Since there isn't *one* pointer to the hashtable, RTP freeing it means SDP has a dangling pointer. 2) Either the SDP dissector shouldn't be creating two separate, unique hashtables for multiple media channels of the same addr:port, or RTP shouldn't be free'ing the previous one. Change-Id: I436e67de6882f84aa82dcbdfe60bf313fe4fd99c Reviewed-on: https://code.wireshark.org/review/918 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-02Add a cople of missing pcap.extension IE:sAndersBroman1-3/+9
Change-Id: I7086349f3fb9e3fd8c1ea902ef08b54c27b0a8c5 Reviewed-on: https://code.wireshark.org/review/923 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27Add dissection of 3G Interface Type package and add some comments aboutAndersBroman1-4/+4
the usage of variables in the h248_package_t struct. Change-Id: Ic5419ab5c20051e56963fe8ea1728d78f95538f0 Reviewed-on: https://code.wireshark.org/review/846 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26More fiddling with heuristic.AndersBroman1-2/+2
Change-Id: I50b78cc38c6f529695ecd54ced0ed94e8a683534 Reviewed-on: https://code.wireshark.org/review/835 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26Fix off by one errorAndersBroman1-1/+1
Change-Id: I24c9e988786a95489f918bed2c043e6eb23e4caa Reviewed-on: https://code.wireshark.org/review/834 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26LTE RRC: add file forgotten in gb981173Pascal Quantin1-1/+8
Change-Id: I1727e56e678c32402f6331463c06c62072c954d8 Reviewed-on: https://code.wireshark.org/review/833 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-25Strengthen RANAP heuristic.AndersBroman1-1/+10
Change-Id: I8f6515d2716bb633f753243b7f86d371a22ebbad Reviewed-on: https://code.wireshark.org/review/826 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Upgrade LPPe dissector to V1_1-20140108-CPascal Quantin4-3895/+4628
Change-Id: I1d5d4ed73825bb5cda0cc2e76e5000c38c50b601 Reviewed-on: https://code.wireshark.org/review/816 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-20Upgrade LTE RRC dissector to v11.7.0Pascal Quantin5-122/+170
Change-Id: If1f64241846cc18463c8c5e9da7dd2a5eaba6733 Reviewed-on: https://code.wireshark.org/review/752 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-19Exported PDU: add support for data length on the wirePascal Quantin1-1/+2
Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597 Reviewed-on: https://code.wireshark.org/review/728 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-17ULP: upgrade dissector to approved version 2.0.1Pascal Quantin4-32/+31
Change-Id: I9d7b16c450cb99aa1d66b0a180241c36f8869637 Reviewed-on: https://code.wireshark.org/review/716 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17Revert de6bfa12b0c002e1930cfb9946078097d294acf8 (break Linux and Mac OS X ↵Alexis La Goutte1-0/+1
buildbot...) Change-Id: If5a6a77909b2d178052605cf2fc6fc0ef758553c Reviewed-on: https://code.wireshark.org/review/706 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-17Fix build on my old Windows XP Buildbot (With VS2008EE)Alexis La Goutte1-1/+0
../../asn1/atn-ulcs/packet-atn-ulcs-template.c(126) : fatal error C1083: Cannot open include file: 'stdint.h': No such file or directory Change-Id: I8825a2f0b6440ec5a4bbfb49ea5c183dd8cbf03f Reviewed-on: https://code.wireshark.org/review/705 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15Remove unused const variables errors seen with recent Clang versionPascal Quantin18-8/+79
Fixes bug 9886 Change-Id: I8624ef1c5874aea5521d21c998510fc29c838936 Reviewed-on: https://code.wireshark.org/review/657 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-15Fix indent (use 2 spaces)Alexis La Goutte1-805/+804
Change-Id: If7872c510d20e9f04e44e3fdf09c023e5ac602d9 Reviewed-on: https://code.wireshark.org/review/648 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-13Bug 9704: GSM_MAP SendRoutingInfoForSM incomplete0xbismarck2-2/+47
Added the field information for Phase 1 for the Send Routing Info For Sm message per request of ticket 9704. Code per the suggestion of Anders Broman. Adding Phase 1 code to GSMMAP.asn. Did not have any data to verify that the change worked. Change-Id: Ic387e2e12e8893abb0f453f5010909ffbfd1808c Reviewed-on: https://code.wireshark.org/review/147 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-13ULP: add UDP transportPascal Quantin1-30/+40
and fix indent (use 2 spaces) Change-Id: I558616e3030a55a845cd4ba31ac32f08bdf8376d Reviewed-on: https://code.wireshark.org/review/634 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-12Get rid of space-before-tab in indentation.Guy Harris1-58/+58
Change-Id: If747e7b2af34e27ca8558293140a74691a0113b4 Reviewed-on: https://code.wireshark.org/review/624 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-12Thou shalt not put newlines in the strings in value_string tables.Guy Harris1-4/+2
That just breaks too many things. This catches the examples of that found in bug 9878. There might be others that my grepping didn't find. We should also have the checkAPIs.pl script check for this, so this isn't a full fix for bug 9878. Change-Id: I3bf6f1fc0fe8654d0f54a995e72f1966ae012f5e Reviewed-on: https://code.wireshark.org/review/623 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-10Remove 1 duplicate #include and several unneeded #include's.Bill Meier1-5/+0
Change-Id: Iab434edd114082586cc13f05b38e6a9d256a74c5 Reviewed-on: https://code.wireshark.org/review/588 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-10Use tvb_length() instead of tvb_reported_length_remaining() for a heuristics ↵Bill Meier1-1/+1
length check. Change-Id: I197fe3d401ffb2d5894c823690a11f4a68fb7268 Reviewed-on: https://code.wireshark.org/review/585 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-08Omitting SubscriberData makes CONTENT OF fail and InsertSubscriberDataArg ↵AndersBroman1-14/+3
will not get all its tags Change-Id: I2ace2271d9ce5650e5239c12e64080463aae9367 Reviewed-on: https://code.wireshark.org/review/556 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSMPascal Quantin2-3/+7
Fixes bug 9829 Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8 Reviewed-on: https://code.wireshark.org/review/494 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier103-515/+515
dissectors. Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 Reviewed-on: https://code.wireshark.org/review/412 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25asn1/kerberos: remember in what frame a key was learnedStefan Metzmacher2-0/+4
Change-Id: I8e64e1d02ee8b4dff3845e1b9ec8f56174e76fbf Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/363 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-22Fix Called function pointer is null (null dereference) found by ClangAlexis La Goutte1-3/+2
../../asn1/h248/packet-h248-template.c:1222:31: warning: Value stored to 'prop' is never read if (!prop->dissector) prop = &no_param; Change-Id: I6d380fbb5fef9dc548385b0b470aea1cb3c34df1 Reviewed-on: https://code.wireshark.org/review/301 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Remove $Id$ from the ASN.1 dissectors and regenerate them.Jeff Morriss1024-2151/+4
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954 Reviewed-on: https://code.wireshark.org/review/244 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-14Add some asn1 files to .gitignore.Jeff Morriss1-1/+13
(Now doing "make -C asn1" doesn't result in any untracked changes.) Change-Id: I2971407f8227ca6f409cfb60d842d58ff2780500 Reviewed-on: https://code.wireshark.org/review/206 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-05Dissector assert in packet-nbap.c. num_items isn't reset before calling a ↵Anders Broman1-0/+5
sequence filling the array. Closed-bug #9726 Change-Id: Ie4bc538b0788eb32895c9eedf8e0277c6d9ed1b2 Reviewed-on: https://code.wireshark.org/review/120 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-02-03Upgrade RRC dissector to v11.8.0Pascal Quantin6-10/+54
Change-Id: If43fc7ec8b5f997e573a9d84fda03f2ca2bf6dc7 Reviewed-on: https://code.wireshark.org/review/94 Tested-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-03Apply g4cc69483 to asn1 templates.Stig Bjørlykke5-6/+6
Change-Id: Id44ef17e7293be5d713c5e9e5d55b25194b46016 Reviewed-on: https://code.wireshark.org/review/86 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-01-27Send news of SecurityModeFailure to PDCP dissector, which will attempt to ↵Martin Mathieson1-1/+16
roll back to previous setting svn path=/trunk/; revision=54978
2014-01-27Add back the fix from revision 54693.Stig Bjørlykke1-0/+3
svn path=/trunk/; revision=54976
2014-01-27Added back x509af_get_last_algorithm_id() removed in revision 54647 to Stig Bjørlykke5-3/+13
restore usage in cms and pkcs12. They never got a valid value in actx->external.direct_reference because they use another actx in this case. This will add back the global variable in x509af, but this is needed until we manage to pass the value in another way. See comments in bug 9573. svn path=/trunk/; revision=54975
2014-01-22I don't see any specification of how a H221NonStandardIdentifier isGuy Harris1-1/+1
encoded, but let's say it's pure ASCII for now. svn path=/trunk/; revision=54899
2014-01-22Use tvb_get_string_enc() with an explicit encoding; it's a + or a -, soGuy Harris1-1/+1
just treat it as ASCII. svn path=/trunk/; revision=54896
2014-01-22The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it asGuy Harris1-1/+1
such. Replace proto_tree_add_string(..., tvb_get_string_enc(same ..., ENC_xxx)) with proto_tree_add_item(..., ENC_xxx). svn path=/trunk/; revision=54895
2014-01-22Another probably-wrong tvb_get_string().Guy Harris1-1/+5
Also, add a URL for the PKCS #12 spec. svn path=/trunk/; revision=54894
2014-01-22To quote section B.5 "Keys for password integrity mode" of PKCS #12Guy Harris1-1/+1
v1.1: Personal Information Exchange Syntax: http://www.emc.com/emc-plus/rsa-labs/pkcs/files/h11301-wp-pkcs-12v1-1-personal-information-exchange-syntax.pdf "When password integrity mode is used to protect a PFX PDU, a password and salt are used to derive a MAC key. As with password privacy mode, the password is a Unicode string, and the salt is a byte string." So, not having found any other references to salts as text strings, copy it with tvb_memdup(), not tvb_get_string(). svn path=/trunk/; revision=54893
2014-01-22Clean up indentation and bracketing.Guy Harris1-42/+49
svn path=/trunk/; revision=54892
2014-01-22The strings in question are generated as UTF-8 from the CBS encoding, soGuy Harris1-1/+1
process them as such. svn path=/trunk/; revision=54891
2014-01-22Another tvb_get_string() replacement.Guy Harris1-1/+1
svn path=/trunk/; revision=54890
2014-01-22Strings in LDAP are generally UTF-8, although if we treat something onlyGuy Harris1-4/+4
as a string if every byte in it is a printable ASCII character, it's ASCII. Use tvb_get_string_enc() with an appropriate encoding. svn path=/trunk/; revision=54889
2014-01-22Use tvb_get_string_enc() with an explicit encoding.Guy Harris1-1/+1
svn path=/trunk/; revision=54886
2014-01-22It's one character, either + or -, hence ASCII.Guy Harris1-1/+1
svn path=/trunk/; revision=54885
2014-01-22It's not a string, it's a byte array (bit array, really).Guy Harris1-2/+3
Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634. svn path=/trunk/; revision=54884
2014-01-21Fix one half-changed tvb_get_string() call.Guy Harris1-1/+1
svn path=/trunk/; revision=54879
2014-01-21IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, notGuy Harris1-2/+2
tvb_get_string(). svn path=/trunk/; revision=54877
2014-01-15Update to version V12.3.0 (2013-12).Anders Broman24-398/+503
svn path=/trunk/; revision=54815
2014-01-14Don't cast away constness.Guy Harris3-5/+5
svn path=/trunk/; revision=54800