aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
AgeCommit message (Collapse)AuthorFilesLines
2015-05-26Remove proto_tree_add_text from some dissectors.Michael Mann1-1/+4
Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc Reviewed-on: https://code.wireshark.org/review/8654 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-25Fix out of tree buildsGraham Bloice1-1/+1
Stop out of tree builds picking up the in-tree version and config.h Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90 Reviewed-on: https://code.wireshark.org/review/8204 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-22p1: Fixed do_address for extension attributesStig Bjørlykke2-4/+25
This is not an optimal solution, but fixes the reported problem. The do_address functionality should probably be rewritten to only use pinfo for storing data. Bug: 11210 Ping-Bug: 8515 Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29 Reviewed-on: https://code.wireshark.org/review/8585 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-19p1: Handle OrganizationalUnitNameStig Bjørlykke1-0/+2
Added back code removed in commit for bug 8515. Bug: 11210 Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace Reviewed-on: https://code.wireshark.org/review/8537 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-05-09Define the SHA-1 digest length in wsutil/sha1.h and use it.Guy Harris2-7/+6
Hopefully that'll make it a little easier to make sure that we're not overflowing arrays. Change-Id: I770df045ef9a45fd486c1271ea424b3334bb39d2 Reviewed-on: https://code.wireshark.org/review/8370 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-09RRC: add domain and release cause information to the INFO column.Martin Mathieson1-0/+7
Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a Reviewed-on: https://code.wireshark.org/review/8353 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-05-05kerberos encryption types (etype) additions + cleanupMark Cunningham1-3/+13
source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf Reviewed-on: https://code.wireshark.org/review/8300 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-05-01C12.22: check c1222_baseoid_len before doing a memcpyPascal Quantin1-4/+10
Should fix the following runtime error reported by Joerg: ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 1, which is declared to never be null ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 2, which is declared to never be null Change-Id: I2f952815ed81e47b504e6479835a357b7656828e Reviewed-on: https://code.wireshark.org/review/8251 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris4-33/+33
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Make some other left-hand operands of <<, and some variables holding results from shifts of that sort, unsigned, while we're at it. Change-Id: Ie72a9d0d518f59b35948267d10c80735d162e8bb Reviewed-on: https://code.wireshark.org/review/8264 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-27Add tshark -z "ldap,srt"Michael Mann2-0/+15
Bug: 9363 Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c Reviewed-on: https://code.wireshark.org/review/8196 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-27S1AP: Add missing protocol IE declaration for E-UTRAN-Trace-IDMartin Mathieson1-0/+1
Change-Id: I03caf29a5a1889884837fccf366cb35d0ccd6281 Reviewed-on: https://code.wireshark.org/review/8213 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-27[RANAP] Heuristics does not work with lenght detremant of 2 bytes.AndersBroman1-3/+5
Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0 Reviewed-on: https://code.wireshark.org/review/8209 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-23LPP: fix a typo in the protocol abbreviationPascal Quantin3-4/+4
Bug: 11141 Change-Id: I2bd00a84dd59bbcfc67bf6b8286cb49fd9ff01f9 Reviewed-on: https://code.wireshark.org/review/8175 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-22Convert proto_tree_add_boolean to ↵Michael Mann2-111/+44
proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-20sv: remove #if0'd codeEvan Huus1-93/+1
we can always get it back from git if we want Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75 Reviewed-on: https://code.wireshark.org/review/8124 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-10Remove depricated API tvb_length -> tvb_reported_lengthAndersBroman15-26/+26
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length -> tvb_reported_lengthAndersBroman9-38/+38
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09REplace deprecated API tvb_length -> tvb_reported_lengthAndersBroman6-13/+13
Change-Id: I6090055a9c31f6787626b810de655d1cc71b99de Reviewed-on: https://code.wireshark.org/review/8002 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09Replace deprecated API tvb_length... with tvb_reported_length...AndersBroman4-19/+19
Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f Reviewed-on: https://code.wireshark.org/review/8001 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08Replace deprecated tvb_length with tvb_reported_length.AndersBroman8-28/+28
Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842 Reviewed-on: https://code.wireshark.org/review/7979 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-06PKCS1: fix a typo for OID 1.3.132.0.35Robert P1-2/+2
Bug: 11106 Change-Id: Ied414b8e0bae8f34445f4d36bc6dfcc96b4a7456 Reviewed-on: https://code.wireshark.org/review/7941 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-03[S1AP] Display the decimal value for TAC.AndersBroman1-1/+12
Change-Id: I12127b5f7e53e2d47a42ad54d4e952f6a184d7b6 Reviewed-on: https://code.wireshark.org/review/7883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-01LTE RRC: fix a typo introduced in g9aa624dPascal Quantin1-2/+2
Change-Id: Ia1bb68c64ca4cb820790dc84abee9cc222a1d0e4 Reviewed-on: https://code.wireshark.org/review/7874 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-31LTE RRC: upgrade dissector to v12.5.0Pascal Quantin9-446/+1069
Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312 Reviewed-on: https://code.wireshark.org/review/7869 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-30LPP: upgrade dissector to v12.4.0Pascal Quantin4-23/+23
Change-Id: Ie09ab1002ccc3f275828615755b3130bfbb14fdc Reviewed-on: https://code.wireshark.org/review/7852 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29RRC: add a missing mask forgotten in gf3d1e3cVincent Helfre1-1/+1
Change-Id: Ib62e15d17ea576f2180ac92d217869768225905d Reviewed-on: https://code.wireshark.org/review/7850 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29RRC: add dissection of ims-Information IEVincent Helfre2-0/+57
Bug: 11096 Change-Id: I348726dcd3b62f75db67e63c07bcdc79e86657a7 Reviewed-on: https://code.wireshark.org/review/7842 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-24ftsanity.py: make it work with modern tsharkPeter Wu1-7/+5
Broken since 4ac2441d7c7371249a3422fc2e67b8ad98aa6631 ("Coalesce "-G fields2" and "-G fields3" into "-G fields"). This patch fixes Python3 compatibility, fixes handling of the changed output and option and prints the faulting line on assertion error. It also updates two dissectors which had tabs in their description, breaking the output. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c Reviewed-on: https://code.wireshark.org/review/7791 Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-13LTE RRC: enhance dissection of Extended Access Barring CategoryPascal Quantin2-0/+13
Change-Id: I6e13ae8c4e95f5915541bc33d89faa61dade2058 Reviewed-on: https://code.wireshark.org/review/7674 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-12Don't pass a t4-non-ecm-sig-end to the tap if we didn't see the start of theJeff Morriss1-1/+3
data: the invalid frame number will crash Wireshark. Bug: 10885 Change-Id: I3ae278b77a9449136fbaaac52f2bbaa8a510bf76 Reviewed-on: https://code.wireshark.org/review/7651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs1-1/+1
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-03-10SPNEGO: fix compilation without KerberosPascal Quantin1-2/+6
Remove a dead increment while we are at it Change-Id: I4a453bbd959e71ff6e85be06d079176abdc33a95 Reviewed-on: https://code.wireshark.org/review/7622 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-10packet-spnego: fix krb5_cfx_wrap without encryptionStefan Metzmacher1-5/+22
We need to use rrc, as the checksum is likely to be rotated before the plaintext payload. For now we only handle the two common cases rrc == 0 and rrc == ec... Ping-Bug: 9398 Change-Id: I548f2f0650716294b6aeb361021be6e44ae8f1b3 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/7271 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-10packet-ldap: use the correct tvb to report the SASL wrapped payloadStefan Metzmacher1-6/+6
Ping-Bug: 9398 Change-Id: I163d3dc99562b3388470c58d05e2d4d2e2f6d00c Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/7477 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-03-08ULP/ILP: add dissection of MSISDN, MDN and IMSI numbersPascal Quantin4-1/+99
Bug: 11038 Change-Id: If4602a8ad434c46ea7986eec566751f4bb667002 Reviewed-on: https://code.wireshark.org/review/7603 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-03GSM MAP: do not use a global variable to store OIDPascal Quantin2-4/+5
Fixes an ASAN failure reported by Alexis Change-Id: I63b07ec4b6eb0698c4abf27f8fb0b1f11a19396d Reviewed-on: https://code.wireshark.org/review/7510 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-03Eliminate e_uuid_t in favor of e_guid_t.Guy Harris1-12/+12
That eliminates a redundant and confusing data type, and avoids issues with one piece of code using e_uuid_t but wanting to use routines expecting an e_guid_t. Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60 Reviewed-on: https://code.wireshark.org/review/7506 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-03Replace tvb_get_ptr calls with a better API choice.Michael Mann1-1/+1
Just reduces the overall tvb_get_ptr usage count in the dissector directory. Change-Id: I455dc4cc9b082ecccdd254a2e5121f3353b5a812 Reviewed-on: https://code.wireshark.org/review/7491 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-28Remove some unneeded includes of <sys/time.h>.Guy Harris1-4/+0
Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d Reviewed-on: https://code.wireshark.org/review/7441 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-26[GTP CDR] Add support for CDR data record format version 12.6.0AndersBroman3-41/+53
Bug: 11015 Change-Id: Iea4a4cd4e4e8b41ef781c92c838f17ea6d16e499 Reviewed-on: https://code.wireshark.org/review/7413 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-25ATN-CPDLC: never put a break in a TRY blockPascal Quantin1-8/+10
It will skip the execution of ENDTRY block Bug: 9952 Change-Id: I55af248b7d31cf1b75aae695ef8c149367791820 Reviewed-on: https://code.wireshark.org/review/7391 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-18H.248: fix dissection of ServiceChangeReason for version 1Pascal Quantin3-45/+2
My understanding of RFC 3015 is that the encoding of this field was not different in version 1 compared to newer releases Bug: 10879 Change-Id: Iaa81679388860c0df4adc673ca6e56aff6f4591c Reviewed-on: https://code.wireshark.org/review/7195 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-18Some additional UAT update callback changes.Guy Harris2-7/+9
I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Make UAT record update callbacks return a success/failure indication.Guy Harris1-1/+5
Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Add a CF_FUNC macro for casting BASE_CUSTOM functions.Gerald Combs2-270/+270
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-17CMIP: get rid of some evil global variablesPascal Quantin2-31/+20
Fixes an ASAN failure reported by Alexis Note that some global variables remain as I do not know enough on this protocol to safely remove them Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c Reviewed-on: https://code.wireshark.org/review/7099 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-14Don't check for C89 headers.Guy Harris1-3/+0
1988 called, they want their lack of a C standard back. We don't need to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as they're specified by C89 and I don't think there are any platforms we care about that don't have a C89 environment in which we could be built. Change-Id: I447551181284fab7722354b62774625ed8ee94bc Reviewed-on: https://code.wireshark.org/review/7110 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-13Replace tabs by spaces when editor modelines has "expandtab"Bill Meier1-1/+1
Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 Also: tabs-stops should be 8 Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-10FTAM: get rid of an evil global variablePascal Quantin2-7/+12
Fixes an ASAN failure reported by Alexis Change-Id: Id0ddad6451e22ffc53d42985e9b2071c7388d15b Reviewed-on: https://code.wireshark.org/review/7049 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-09ldap: simplify Start TLS handlingPeter Wu2-56/+21
RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann <mmann78@netscape.net>