Commit Graph

43 Commits

Author SHA1 Message Date
Tomas Kukosa 5cd8c719e6 ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb
svn path=/trunk/; revision=18921
2006-08-16 05:58:39 +00:00
Tomas Kukosa 604000a6b3 - remove some #.MODULE_IMPORT from .cng files
- regenerate BER dissectors so as to change rest of Ethereal->Wireshark and asn2eth -> asn2wrs

svn path=/trunk/; revision=18217
2006-05-24 12:24:54 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Ronnie Sahlberg 2975ff835b microsoft does not use a confounder for spnego when using DNS/TSIG
they use an additional confounder everywhere else  (as it seems)   but not for DNS/TSIG


svn path=/trunk/; revision=16894
2005-12-25 11:43:47 +00:00
Guy Harris b45d2efe6d Regenerate with the latest asn2eth, to get FT_OID used, and to add #line.
svn path=/trunk/; revision=16736
2005-12-08 23:29:21 +00:00
Tomas Kukosa 3b770d5c7c - dissect_ber_object_identifier() returns value as tvb
- new dissect_ber_object_identifier_str() function
 - BER dissectors adapted and regenerated

svn path=/trunk/; revision=16501
2005-11-14 10:02:31 +00:00
Guy Harris 341a2f503d dissect_ber_octet_string() can return a null tvbuff pointer, if the
putative octet string isn't one; always check before using it to
dissect, and don't call the dissector if the tvbuff is null.  This
should fix bug 472.

svn path=/trunk/; revision=15946
2005-09-21 23:23:58 +00:00
Guy Harris 4e09b5e0b3 Some compilers don't allow a static declaration of a function inside
another function, so move the declaration of
dissect_spnego_PrincipalSeq() to the top of the file.

svn path=/trunk/; revision=15938
2005-09-21 18:27:28 +00:00
Guy Harris 0fb81e221e An InnerContextToken comes with an OID for the mechanism, which is what
we use to determine how to interpret the token; don't bother fetching
the OID attached to the frame or conversation, as we're not using it.

Indent code in the .cnf file to match the code generated by asn2eth.

The mechListMIC in a NegTokenInit is sometimes a sequence containing a
string; check the header of the mechListMIC and dissect it as such a
sequence or as a regular item depending on whether it's a sequence or
not.

If we see a supportedMech in a NegTokenTarg, save next_level_value for
that OID with the conversation.

Dissect a responseToken in a NegTokenTarg, and a mechListMIC in a
NegTokenTarg, appropriately.

Get rid of "gssapi_dissector_handle()", and just use
next_level_value->handle - it was never being called if next_level_value
was null.

When we're dissecting a KRB5 blob, just use get_ber_identifier() to get
the header, so we don't report an ASN.1 error if there isn't a BER
identifier there; dissect the identifier and length only if we know we
have them.

svn path=/trunk/; revision=15937
2005-09-21 17:42:11 +00:00
Gerald Combs 876ce82beb Don't dereference a null pointer. Fixes bug 460.
svn path=/trunk/; revision=15874
2005-09-19 19:46:25 +00:00
Gerald Combs d2e3d45042 In the SPNEGO dissector, don't call a subdissector if we don't have a TVB.
Fixes bugs 448, 449, 451, 452, 454, 456, and 461.

Add similar TVB checks to the BER dissector.

svn path=/trunk/; revision=15869
2005-09-19 16:23:05 +00:00
Guy Harris f91d140cc9 Don't use u_char - not all platforms define it, and even those that do
might require other files to be included to get it.

svn path=/trunk/; revision=15828
2005-09-15 23:39:08 +00:00
Anders Broman 0060eaf390 Replace the spnego dissector with an asn2eth generated one.
svn path=/trunk/; revision=15810
2005-09-15 05:38:37 +00:00
Ronnie Sahlberg 40cf0a8c80 when we have raw keberos inside the spnego blob, pass it as is over to
the kerberos dissector  and do not strip the ber tag and lengths off


svn path=/trunk/; revision=15794
2005-09-14 16:02:54 +00:00
Anders Broman a665e35a38 Get rid of dependency on format-oid.h
svn path=/trunk/; revision=15756
2005-09-11 21:10:20 +00:00
Guy Harris 9b4994afcd I missed one OID string.
svn path=/trunk/; revision=15526
2005-08-25 03:43:16 +00:00
Guy Harris bcb91d2f45 The OID strings returned by new_format_oid(), and the OID string
returned by format_oid(), are allocated with the ep_alloc routines;
don't free them.

svn path=/trunk/; revision=15525
2005-08-25 03:31:54 +00:00
Ronnie Sahlberg 00f45a872c remove a gmalloc and al sprintf from spnego
svn path=/trunk/; revision=15445
2005-08-19 23:03:56 +00:00
Gerald Combs b992c73391 In packet-frame.c, don't free static memory when we throw a
DissectorError.  In packet-kerberos.c, restore pinfo->private_data if
we throw an exception, which keeps the SMB dissector from throwing
a DissectorError.  Initialize variables in other places to squelch
valgrind warnings.

svn path=/trunk/; revision=15235
2005-08-06 03:43:42 +00:00
Guy Harris 554f620001 Constify to remove a bunch of warnings. Add some casts to squelch
(presumably-)harmless-but-otherwise-unremovable const-to-nonconst
warnings.

In the TACACS dissector, clean up the variables used in option parsing
to avoid some const-to-nonconst warnings.

Clean up some white space.

svn path=/trunk/; revision=15043
2005-07-24 19:01:28 +00:00
Guy Harris 2fcce4b6c4 Fix some more signed vs. unsigned warnings.
svn path=/trunk/; revision=14903
2005-07-12 01:01:19 +00:00
Guy Harris 8647bbf353 Make a bunch of items in encryption code arrays of guint8, and make some
pointers either "void *" or "guint8 *", to reduce the level of compiler
warnings (the data in question is largely binary in those cases).

svn path=/trunk/; revision=14886
2005-07-09 03:25:25 +00:00
Ronnie Sahlberg 33f4400f83 the maximum ASN OID length is 256 bytes and there is a define to control this.
fix bug251 and all other occurances where an oid string  passed to packet_ber_object_identifier()
is not defined as foo[MAX_OID_STR_LEN]

svn path=/trunk/; revision=14720
2005-06-21 09:38:59 +00:00
Ronnie Sahlberg c3cfe365cf convert the function
dissect_spnego_mechTypes() tu use the packet-ber api instead of the 
asn1 api.


svn path=/trunk/; revision=14712
2005-06-20 10:22:03 +00:00
Ronnie Sahlberg bdac892d95 convert one function to use packet-ber instead of asn1
svn path=/trunk/; revision=14711
2005-06-20 09:43:29 +00:00
Ronnie Sahlberg b958accede move one function only used by SPNEGO to packet-spnego.c
remove the include of <epan/asn1.h> from kerberos, ntlmssp and gssapi since they no longer need to include that file.


svn path=/trunk/; revision=14709
2005-06-20 05:28:56 +00:00
Ronnie Sahlberg 9e7a393c1f make ethereal decrypt gss-krb (secure ldap and ms signandseal for dce)
also when linked with mit kerberos




svn path=/trunk/; revision=13850
2005-03-21 10:52:57 +00:00
Ronnie Sahlberg 31f7bd0e60 remove some heimdal dependencies we dont really need
and prepare for gssapi mit support


svn path=/trunk/; revision=13849
2005-03-21 10:07:55 +00:00
Guy Harris 0af4492612 Don't try to run net-snmp-config if we don't find it.
Check whether krb5.h defines KEYTYPE_ARCFOUR_56 - not all versions do
(in particular, the Heimdal that comes with FreeBSD 4.6 doesn't).

packet-kerberos.h includes krb5.h if we hae Heimdal; we don't need to do
so in packet-spnego.c.

svn path=/trunk/; revision=13828
2005-03-20 19:29:22 +00:00
Guy Harris 90f8224360 Have GSS-API subdissectors supply a "data is encrypted" flag to their
callers, so that they can tell "no decrypted tvbuff because I couldn't
decrypt it" from "no decrypted tvbuff because it's not encrypted in the
first place".  Set that based on the Kerberos seal algorithm field in
the SPNEGO Kerberos 5 wrap dissector code.

Use that to determine whether the GSS-API encapsulated data in LDAP is
encrypted or not., rather than using a heuristic.

Set the length of the SASL blob tvbuff based on the SASL length and the
length of the tvbuff from which it's consstructed, rather than setting
it to the SASL length.

svn path=/trunk/; revision=13780
2005-03-16 21:59:25 +00:00
Ronnie Sahlberg 349c5a8699 from metze
various bugfixes and enhancements to decryption of secure ldap


svn path=/trunk/; revision=13710
2005-03-11 09:31:11 +00:00
Ronnie Sahlberg 8700645d54 add support to decrypt and dissect sign-and-sealed traffic.
(cifs: dc's talking to eachother   and when longhorn comes out: anyone wanting to talk dce to a dc!)

((this is an incredibly advanced feature well worthy of mentioning in NEWS))


svn path=/trunk/; revision=13690
2005-03-10 10:16:49 +00:00
Gerald Combs aa8bea0559 Add a couple of definitions not present in MIT Kerberos. Fix a compiler
warning.

svn path=/trunk/; revision=13682
2005-03-09 19:43:29 +00:00
Ronnie Sahlberg 6626c6aac2 refactor the code to not use heimdal functions to decrypt and unwrap the blob.
use builtin functrions instead  which will make it trivial to add this support to mit later


svn path=/trunk/; revision=13680
2005-03-09 11:59:40 +00:00
Guy Harris 33006e7f92 Squelch some compiler warnings if we don't have Kerberos.
svn path=/trunk/; revision=13670
2005-03-09 03:03:10 +00:00
Ronnie Sahlberg 0aad06dea5 use the rc4 functions from epan/crypt-rc4 instead of those in heimdal
so that we dont have to include <rc4.h> from heimdal

hopefully the build on freebsd will succeed now


svn path=/trunk/; revision=13668
2005-03-08 23:47:29 +00:00
Ronnie Sahlberg 176c87d3dd remove some dependencies of libgssapi
svn path=/trunk/; revision=13665
2005-03-08 21:13:14 +00:00
Ronnie Sahlberg 95532c9493 remove the need to include <gssapi.h> from heimdal
svn path=/trunk/; revision=13664
2005-03-08 20:22:07 +00:00
Ronnie Sahlberg 6e6e082d34 when HEIMDAL is linked with :
make spnego able to decrypt data wrapped inside
 GSSAPI/SPNEGO/KRB5 arcfour-hmac

This code will be more etherealified and evolve into being able to link with MIT as well.



svn path=/trunk/; revision=13659
2005-03-08 09:45:19 +00:00
Ronnie Sahlberg 7a43aeb457 minor update, add an extra parameter to a call to prepare for decryption of GSSAPI wrapped data
svn path=/trunk/; revision=13642
2005-03-06 22:52:58 +00:00
Lars Roland ec9ca01616 Move the following files from /trunk to /trunk/epan:
asn1.[ch]
follow.[ch]
ptvcursor.[ch]
reassemble.[ch]
xmlstub.[ch]

fix #include statements accordingly.

svn path=/trunk/; revision=13366
2005-02-09 23:38:00 +00:00
Anders Broman 851ecd2ac4 From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the 
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass 
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image 
are present, and T.38 conversation if only m=image is present. I expect that 
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38 
packets.

svn path=/trunk/; revision=13243
2005-02-02 20:07:03 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00