Commit Graph

20 Commits

Author SHA1 Message Date
Ronnie Sahlberg d83b8b0336 kerberos/gss enhancements
add a parameter *datalen to decrypt_krb5_data() so that we can pass back 
the length of the decrypted blob back to the caller.
This is useful for when there are "junk" at the end of the blob and thus 
the decrypted data is not the same size as the encrypted blob.
GSS CFX is one such example.
(we should have done this earlier since it might have made some other 
stuff easier to imlement...)


make the preference setting krb_decrypt a globally visible variable so 
we can see its value and act on it from callers of krb decryption from 
outside of packet-kerberos.c    i.e.   from GSS CFX


Make keytype == -1  a wildcard that when passed to decrypt_krb5_data() 
will try any/all encryption keys.
This since GSS CFX does not provide the enctype in the GSS layer.
(The GSS CFX enctype is only negotiated during the AP-REQ/REP  so we 
should later pick this value up and store it in a CFX session variable.
That is for a later enhancement.
)


Enhance the GSS decryption (that for hitorical reasons are implemented 
in packet-spnego.c  and not packet-gssapi.c :-)  )
to also handle decryption of GSS CFX

This should make wireshark able to decrypt any/all GSSAPI  RFC4121 
packets, if the keytab file is provided.


I have successfully decrypted LDAP using GSS CFX with AES encryption 
with this.




svn path=/trunk/; revision=26350
2008-10-05 00:28:36 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Anders Broman 4c692a62b6 Start introducing actx to ber functions.
svn path=/trunk/; revision=21705
2007-05-06 22:34:05 +00:00
Jörg Mayer a8f4da5ead Sebastien Tandel:
some warning fixes

packet-http.c
    set headers.content_length = 0 before the first potential use of it.
packet-kink.c
    "ifdef kerberos" around one function declaration
packet-nbns.c
    set headers.{dgm_length|pkt_offset|error_code} = 0
packet-pflog.c
    delete capture_pflog and
capture_old_pflog which aren't used anymore in the code.

svn path=/trunk/; revision=21120
2007-03-22 15:19:49 +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
Jörg Mayer eab0aeb4bb More char -> const char fixes
Declare some functions static

svn path=/trunk/; revision=15158
2005-07-30 16:34:38 +00:00
Ulf Lamping 4d6daa907c packet-http.c(484) : warning C4101: 'i' : unreferenced local variable
packet-http.c(486) : warning C4101: 'si' : unreferenced local variable
packet-kink.c(628) : warning C4101: 'quick_mode_payloads_length' : unreferenced local variable

svn path=/trunk/; revision=15051
2005-07-25 01:22:03 +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
Guy Harris 85f9363860 Squelch some compiler warnings.
svn path=/trunk/; revision=14649
2005-06-16 06:27:18 +00:00
Guy Harris 3b3670d2d3 Static variables considered harmful. Make the ISAKMP version a
parameter to many functions inside the ISAKMP dissector, as well as to
the "isakmp_dissect_payloads()" routine it exports.  Get rid of
"isakmp_set_version()", as the version can be passed to
"isakmp_dissect_payloads()" from the KINK dissector.

Put the declaration of "isakmp_dissect_payloads()" into a
"packet-isakmp.h" header, and have "packet-isakmp.c" and "packet-kink.h"
include it rather than declariing "isakmp_dissect_payloads()" itself -
or not doing so at all.

svn path=/trunk/; revision=14648
2005-06-16 06:19:03 +00:00
Ronnie Sahlberg 0890269d05 from Gilbert,
make kink compile again on non-kerberos builds.

encapsulate a call to decrypt kerberos to only be compiled in when compiling with kerberos.


svn path=/trunk/; revision=14458
2005-05-27 21:39:38 +00:00
Ronnie Sahlberg 94d8512749 From T.Nakashima
updates to KINK


svn path=/trunk/; revision=14453
2005-05-27 08:53:07 +00:00
Gerald Combs f9b17cefe1 Add a few more payload length checks.
svn path=/trunk/; revision=13896
2005-03-24 21:17:08 +00:00
Ulf Lamping d2afae8211 two bugfixes (reported by buildbot randpkt):
don't use the return value of gmtime, if it's NULL

prevent from an endless loop, if payload_length is 0

svn path=/trunk/; revision=13853
2005-03-21 20:01:35 +00:00
Ronnie Sahlberg 941769c640 fix a string in the hf fields
svn path=/trunk/; revision=13803
2005-03-18 20:24:08 +00:00
Gerald Combs 67b0b5a54a Increase the width of some unsigned ints, so that we don't roll them over.
This fixes the crash file at
http://www.ethereal.com/distribution/buildbot-builds/randpkt/randpkt-udp.port==53,KINK.out.1111097410 .

Make the protocol name lower case.

svn path=/trunk/; revision=13797
2005-03-18 00:23:16 +00:00
Ronnie Sahlberg 549ec8ee25 fix typo in name of KINK developer
svn path=/trunk/; revision=13749
2005-03-14 10:27:25 +00:00
Guy Harris d7855a3c4d Fix the properties.
svn path=/trunk/; revision=13671
2005-03-09 03:04:46 +00:00
Guy Harris 77780b3697 "time_t", not "timer_t".
svn path=/trunk/; revision=13669
2005-03-09 02:39:31 +00:00
Ronnie Sahlberg 0f5bac2858 New protocol : KINK
From Taekshi Nakashima   the KINK protocol


svn path=/trunk/; revision=13667
2005-03-08 22:32:43 +00:00