osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
51919 commits 23 branches 0 tags 1.3 GiB
Commit graph

2949 commits

Author SHA1 Message Date
Bill Meier
1dff4e309d Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate 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-26 19:38:21 +00:00
Stefan Metzmacher
98e6bb18d3 asn1/kerberos: remember in what frame a key was learned 
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-25 21:47:10 +00:00
Alexis La Goutte
88c34ec6c8 Fix Called function pointer is null (null dereference) found by Clang 
../../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-22 16:43:50 +00:00
Jeff Morriss
8c608e6e82 Remove $Id$ from the ASN.1 dissectors and regenerate them. 
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-18 03:05:28 +00:00
Jeff Morriss
7a503703ac Add some asn1 files to .gitignore. 
(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-14 02:10:00 +00:00
Anders Broman
5236d89e26 Dissector assert in packet-nbap.c. num_items isn't reset before calling a 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-05 16:03:54 +00:00
Pascal Quantin
8f547d74dc Upgrade RRC dissector to v11.8.0 
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-03 22:25:12 +00:00
Stig Bjørlykke
3ba10a7051 Apply g4cc69483 to asn1 templates. 
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-02-03 10:05:25 +00:00
Martin Mathieson
f903141d65 Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting 
svn path=/trunk/; revision=54978
 2014-01-27 12:06:46 +00:00
Stig Bjørlykke
fbaff1f081 Add back the fix from revision 54693. 
svn path=/trunk/; revision=54976
 2014-01-27 09:55:46 +00:00
Stig Bjørlykke
face757db3 Added back x509af_get_last_algorithm_id() removed in revision 54647 to 
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-27 09:02:06 +00:00
Guy Harris
90e6423c38 I don't see any specification of how a H221NonStandardIdentifier is 
encoded, but let's say it's pure ASCII for now.

svn path=/trunk/; revision=54899
 2014-01-22 07:33:57 +00:00
Guy Harris
d262ff8789 Use tvb_get_string_enc() with an explicit encoding; it's a + or a -, so 
just treat it as ASCII.

svn path=/trunk/; revision=54896
 2014-01-22 04:53:43 +00:00
Guy Harris
9ec41e3db2 The stuff you get from dissect_cbs_data() is UTF-8 encoded; treat it as 
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-22 04:50:23 +00:00
Guy Harris
d85bca8969 Another probably-wrong tvb_get_string(). 
Also, add a URL for the PKCS #12 spec.

svn path=/trunk/; revision=54894
 2014-01-22 04:39:31 +00:00
Guy Harris
051cb78cd9 To quote section B.5 "Keys for password integrity mode" of PKCS #12 
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-22 04:27:15 +00:00
Guy Harris
19930d6f49 Clean up indentation and bracketing. 
svn path=/trunk/; revision=54892
 2014-01-22 04:14:05 +00:00
Guy Harris
c85b34ed66 The strings in question are generated as UTF-8 from the CBS encoding, so 
process them as such.

svn path=/trunk/; revision=54891
 2014-01-22 04:13:37 +00:00
Guy Harris
e163578906 Another tvb_get_string() replacement. 
svn path=/trunk/; revision=54890
 2014-01-22 02:41:13 +00:00
Guy Harris
c12dc67752 Strings in LDAP are generally UTF-8, although if we treat something only 
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-22 02:37:45 +00:00
Guy Harris
5e0641f271 Use tvb_get_string_enc() with an explicit encoding. 
svn path=/trunk/; revision=54886
 2014-01-22 02:04:15 +00:00
Guy Harris
e35ca75a68 It's one character, either + or -, hence ASCII. 
svn path=/trunk/; revision=54885
 2014-01-22 01:28:31 +00:00
Guy Harris
a75657bbd6 It's not a string, it's a byte array (bit array, really). 
Also, RFC 5035 isn't a complete ESS spec, it's an update to RFC 2634.

svn path=/trunk/; revision=54884
 2014-01-22 01:22:01 +00:00
Guy Harris
87f4b376f1 Fix one half-changed tvb_get_string() call. 
svn path=/trunk/; revision=54879
 2014-01-21 20:13:17 +00:00
Guy Harris
73598a7991 IA5 = ASCII. Use tvb_get_string_enc() with an explicit encoding, not 
tvb_get_string().

svn path=/trunk/; revision=54877
 2014-01-21 20:08:39 +00:00
Anders Broman
1f8d2e25d2 Update to version V12.3.0 (2013-12). 
svn path=/trunk/; revision=54815
 2014-01-15 07:13:23 +00:00
Guy Harris
f862fc40ba Don't cast away constness. 
svn path=/trunk/; revision=54800
 2014-01-14 18:35:36 +00:00
Guy Harris
570a36436c Consistently use "guint8" for "8-bit byte". 
Constify.

For routines that manipulate sequences of 8-bit bytes, have them take
guint8 pointers rather than void pointers.

Don't cast away constness.

svn path=/trunk/; revision=54795
 2014-01-14 18:03:54 +00:00
Guy Harris
13176da15b Don't cast away constness. 
svn path=/trunk/; revision=54793
 2014-01-14 17:47:31 +00:00
Guy Harris
0a99ee25d5 Don't make claims of constness that can't be guaranteed in terms the C 
compiler can verify.

svn path=/trunk/; revision=54792
 2014-01-14 17:45:03 +00:00
Pascal Quantin
a48b6f4aac Upgrade LTE RRC dissector to v11.6.0 
svn path=/trunk/; revision=54789
 2014-01-14 16:51:10 +00:00
Guy Harris
ecdc864656 Don't cast away constness. 
svn path=/trunk/; revision=54780
 2014-01-14 08:32:50 +00:00
Guy Harris
e1b57afbc9 Don't cast away constness. 
svn path=/trunk/; revision=54779
 2014-01-14 08:30:45 +00:00
Guy Harris
9232db14c7 But *do* cast const void * to the appropriate type. 
svn path=/trunk/; revision=54778
 2014-01-14 08:30:24 +00:00
Guy Harris
1ec9417a43 Don't cast away constness. 
svn path=/trunk/; revision=54777
 2014-01-14 08:26:24 +00:00
Guy Harris
6b8e8d3fea Make a routine not used outside the SNMP dissector static. 
svn path=/trunk/; revision=54751
 2014-01-14 02:06:42 +00:00
Pascal Quantin
41a13add47 Upgrade LPP dissector to v11.5.0 
svn path=/trunk/; revision=54737
 2014-01-13 22:57:31 +00:00
Alexis La Goutte
4a09abdf67 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 
svn path=/trunk/; revision=54732
 2014-01-13 22:25:13 +00:00
Stig Bjørlykke
a7c8e678bf Added a check for valid algorithm id. 
svn path=/trunk/; revision=54653
 2014-01-08 08:19:51 +00:00
Michael Mann
92a567f20d Make global algorithm_id in x509af dissector a direct_reference instead. Bug 9573 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9573). Removes valgrind warnings as well as just being Good Code. 
svn path=/trunk/; revision=54647
 2014-01-08 04:55:59 +00:00
Anders Broman
5a3ba6c19b Omit assignment for not used types. 
svn path=/trunk/; revision=54614
 2014-01-06 08:30:53 +00:00
Anders Broman
0c3f422b30 Omit assignment for not used types. 
svn path=/trunk/; revision=54596
 2014-01-04 17:48:15 +00:00
Anders Broman
3a533ccc32 Omit assignment for not used types. 
svn path=/trunk/; revision=54593
 2014-01-04 12:03:02 +00:00
Anders Broman
c7c5e4f54e Omit assignment for not used types. 
svn path=/trunk/; revision=54592
 2014-01-04 11:54:27 +00:00
Anders Broman
6b58ef91d4 Omit assignment for not used types. 
svn path=/trunk/; revision=54591
 2014-01-04 11:48:40 +00:00
Anders Broman
42e0144f08 Remove unused function and variable. 
svn path=/trunk/; revision=54590
 2014-01-04 11:40:43 +00:00
Anders Broman
2334acec2c Omit assignment for not used types. 
svn path=/trunk/; revision=54589
 2014-01-04 11:34:46 +00:00
Anders Broman
4763f36a75 Omit assignment for not used types. 
svn path=/trunk/; revision=54588
 2014-01-04 11:26:30 +00:00
Anders Broman
2b32fed0ef Omit assignment for not used types. 
svn path=/trunk/; revision=54587
 2014-01-04 11:24:33 +00:00
Anders Broman
72970675bd Add the rest of the NOKIA extensions. 
svn path=/trunk/; revision=54586
 2014-01-04 10:06:04 +00:00