Commit Graph

71 Commits

Author SHA1 Message Date
Guy Harris 9d3a03d975 From Jean-Baptiste Marchand: fix up a couple of #defines that collided
with existing defines.

svn path=/trunk/; revision=11150
2004-06-15 09:50:57 +00:00
Ronnie Sahlberg ede1fb8cee some more encryption types and checksum types
svn path=/trunk/; revision=11135
2004-06-10 13:33:50 +00:00
Ronnie Sahlberg 3135922644 get rid of a compiler warning
svn path=/trunk/; revision=11105
2004-06-04 11:35:14 +00:00
Ronnie Sahlberg 6ff0cf2828 Add a mechanism where one can provide callbacks to the kerbgeros dissector
to pass back dissection of application specific fields (octet strings)

This can later be used to pick up session keys by dcerpc and similar.
Currently it will initially be used by packetcable.

PacketCable additions by Thomas Anders

svn path=/trunk/; revision=11101
2004-06-04 01:56:25 +00:00
Ronnie Sahlberg 581724041a make KRB_SAFE more consistent with the other PDUs by removing the SAFE expansion.
cosmetic: Put the application type on the kerberos subtree

svn path=/trunk/; revision=11012
2004-05-27 08:22:04 +00:00
Ronnie Sahlberg c7bf0b4211 remove the SAFE_BODY expansion to make KRB5_MSG_SAFE look more consistent
with the other application dissectors.

svn path=/trunk/; revision=11007
2004-05-26 11:04:15 +00:00
Ronnie Sahlberg 8451fe82d0 implementation of the KRB_SAFE application
svn path=/trunk/; revision=11005
2004-05-26 08:53:45 +00:00
Guy Harris 0b16140ac4 Get rid of some extra blanks.
svn path=/trunk/; revision=10991
2004-05-25 02:59:14 +00:00
Ronnie Sahlberg 62f9ddcbc2 New protocol : PacketCable : PKTC
The AP-REQ and AP_REP packets are partially dissected up to and including the kerberos blob.

work in progress

svn path=/trunk/; revision=10916
2004-05-18 08:22:27 +00:00
Ronnie Sahlberg a24e2dea10 rename the NOT_DECODED_YET macros to avoid a name clash
for those sources that include both packet-ber.h and packet-per.h

svn path=/trunk/; revision=10912
2004-05-17 20:03:36 +00:00
Ronnie Sahlberg 0f9577e5b1 More updates to packetcable kerberos
in particular,  packetcable use a slightly diufferent KDC-REQ-BODY
where the field  till[5] is optional.
Make it optional in the dissector as well since ethereal will still be able to dissecto normal kerberos pdus where it is not optional

svn path=/trunk/; revision=10899
2004-05-14 23:38:39 +00:00
Ronnie Sahlberg 496c1732b3 work in progress started implementing PA-PK-AS-REQ
svn path=/trunk/; revision=10886
2004-05-14 03:19:02 +00:00
Ronnie Sahlberg a8e9885c39 add dissection of pa-prov-srv-location preauthentication type used by packetcable.
svn path=/trunk/; revision=10883
2004-05-14 01:58:31 +00:00
Guy Harris 05ce3fd4ac Kerberos encryption types are ASN.1 integers, meaning signed values, and
at least one mail message:

	http://mailman.mit.edu/pipermail/kerberos/2004-February/004653.html

shows some of the weird Microsoft encryption type values logged by some
KDC implementation as negative integers.  Also, show them as decimal in
the top-level line for encryption types, just as we do in the lines for
each encryption type.

svn path=/trunk/; revision=10848
2004-05-11 07:30:33 +00:00
Ronnie Sahlberg 09e902f53b decryption and dissection of PA_ENC_TIMESTAMP
svn path=/trunk/; revision=10604
2004-04-15 08:34:21 +00:00
Ronnie Sahlberg 08b916c983 dissect EncKDCRepPart applications 25 and 26
svn path=/trunk/; revision=10603
2004-04-15 07:47:47 +00:00
Ronnie Sahlberg fb40dcdc75 Add support to decrypt the encrypted part of AS/TSG -REP PDUs.
Now we only need application 25/26 to be dissected as well for it to be
useful ...

svn path=/trunk/; revision=10553
2004-04-05 00:49:32 +00:00
Ronnie Sahlberg 63945d3d79 Added some more principal name types from the kerberos draft
svn path=/trunk/; revision=10552
2004-04-05 00:28:41 +00:00
Ronnie Sahlberg df48f692e4 add dissection of the canonicalize bit which some windows clients use
svn path=/trunk/; revision=10536
2004-04-01 09:15:24 +00:00
Guy Harris 2486aeff7a Fix a typo.
Clean up white space.

svn path=/trunk/; revision=10492
2004-03-26 00:21:53 +00:00
Guy Harris 05976bdc31 From Tomas Kukosa: use the "proto_item_get_parent()" and
"proto_item_get_parent_nth()" routines, and use the new name for some of
the constants for universal tags.

svn path=/trunk/; revision=10490
2004-03-26 00:00:11 +00:00
Guy Harris a6ed2d499a From Tomas Kukosa: BER dissector enhancements and proto.c updates to
support them.

From Ronnie Sahlberg: Kerberos updates with new constants from the
current draft, decryption and dissection of Kerberos blobs, and changes
to work with the changed BER dissector.

svn path=/trunk/; revision=10479
2004-03-25 09:18:03 +00:00
Ronnie Sahlberg 3353ca1d5a for netbios type addresses in kerberos
print the netbios type as hex and not decimal

svn path=/trunk/; revision=10235
2004-02-25 07:52:37 +00:00
Ronnie Sahlberg 0b94f16891 update to kerberos. now also decrypting the KRB_PRIB blobs
(application 21) of kerberos v5.
there are commonly found in Kpasswd packets.

Not too interesting yet until we start supporting decryption of kerberos
blobs using mit/heimdal kerveros shared libraries.

svn path=/trunk/; revision=10197
2004-02-23 08:39:42 +00:00
Ronnie Sahlberg dce73d4e1f Update to Kerberos.
Split kerberos prototype into two halves:
helpers to dissect ASN.1 BER in packet-ber.c
and kerberos stuff using those helpers in packet-kerberos.c

This new kerberos thing places filterable items for every single field
and also dissects the bitstring Option fields.

It is hoped that this will make it easier to extend kerberos to do decryption of service tickets.

svn path=/trunk/; revision=10122
2004-02-20 10:04:10 +00:00
Guy Harris 506a842a42 "%.*" requires an "int" argument for the length.
svn path=/trunk/; revision=9803
2004-01-23 09:50:47 +00:00
Guy Harris 0e88c900ff Fix a check.
svn path=/trunk/; revision=9761
2004-01-21 01:10:20 +00:00
Guy Harris f85630766d The offset argument to a "get_pdu_len" function is an "int", not a
"guint".

svn path=/trunk/; revision=9759
2004-01-20 20:32:25 +00:00
Jörg Mayer ccacfeebeb signed/unsigned warning fixes
svn path=/trunk/; revision=9754
2004-01-20 19:24:42 +00:00
Ronnie Sahlberg e83aeb6431 update to kerberos
if the kerberos blob contains a krb error, print the error string to COL_INFO

svn path=/trunk/; revision=9170
2003-12-04 08:15:20 +00:00
Guy Harris d1819d7c34 As "dissect_ap_options()" isn't compiled in, don't mark its arguments as
unused; presumably it'll either

	1) get written, in which case if an argument isn't used it
	   shouldn't be supplied

or

	2) be removed, in which case there aren't any arguments.

svn path=/trunk/; revision=7983
2003-07-08 06:39:13 +00:00
Tim Potter 05330d4ac9 Fix some unused parameter and function warnings.
svn path=/trunk/; revision=7981
2003-07-08 04:06:26 +00:00
Richard Sharpe 47817bcb26 Fix a small segmentation fault if we get an ASN.1 parse error, and
start to work on kerberos flags etc.

Also prettied up the case where the responseToken was an empty string.

svn path=/trunk/; revision=7767
2003-06-01 20:34:20 +00:00
Guy Harris a7b02e051a Show the URL of the I-D giving information on Kerberos-over-TCP.
svn path=/trunk/; revision=7565
2003-04-25 21:30:42 +00:00
Guy Harris 0e48f176af From Tony Schene: Kerberos-over-TCP support.
svn path=/trunk/; revision=7564
2003-04-25 21:29:19 +00:00
Guy Harris 5d3283f7e8 Fix a typo in Richard's name.
Add some additional information from

	http://www.isi.edu/people/bcn/krb-revisions/krbclar8-1.html

svn path=/trunk/; revision=6245
2002-09-10 08:55:34 +00:00
Guy Harris 9207c4b0c3 Add Microsoft's RC4-HMAC and exportable(?) RC4-HMAC encryption types.
svn path=/trunk/; revision=6242
2002-09-10 02:15:55 +00:00
Guy Harris deb560618d KRB_DECODE_STRING_OR_DIE, and variants thereof, set "val_len" to the
length of the string value and "item_len" to the length of the entire
BER item, including the type header.  As such, "val_len", not
"item_len", should be used when formatting the value, and "item_len",
not "val_len", should be used as the length when putting the item into
the protocol tree and when advancing the offset.

The kvno in an encryptedData item is unsigned; display it as such.

svn path=/trunk/; revision=6231
2002-09-08 22:41:23 +00:00
Richard Sharpe 95c2dfb4b3 Decode AP-REQ and AP-REP KRB5 message types ...
svn path=/trunk/; revision=6211
2002-09-07 08:43:04 +00:00
Richard Sharpe 5739c418b7 OK, now have KRB5 dissector playing nice.
svn path=/trunk/; revision=6209
2002-09-07 03:32:49 +00:00
Richard Sharpe 97a92267db Commit my changes to handle KRB5 in SPNEGO ...
Turns out it is a KRB5 AP-REQ ASN1 encoded, and the Kerberos dissector is
going to need to be re-architected to deal with this.

svn path=/trunk/; revision=6187
2002-09-05 03:49:03 +00:00
Richard Sharpe 174fb49854 Add some level of OID naming etc ...
svn path=/trunk/; revision=6180
2002-09-04 21:34:38 +00:00
Richard Sharpe 9e310b26b3 Add the OID that MS created for KRB5 in mistake.
svn path=/trunk/; revision=6164
2002-09-01 01:31:55 +00:00
Guy Harris 4e4000a12d Make "gssapi_init_oid()" take a dissector handle rather than a
registered dissector name; that means you don't have to register a
dissector by name to associate it with a GSS-API security mechanism OID.

svn path=/trunk/; revision=6163
2002-08-31 22:22:29 +00:00
Guy Harris d2143a880e Include "packet-gssapi.h" to declare routines we call.
svn path=/trunk/; revision=6142
2002-08-30 10:05:26 +00:00
Richard Sharpe 765bad85dc Some more SPNEGO fixes. Getting much closer ...
svn path=/trunk/; revision=6140
2002-08-30 06:11:35 +00:00
Jörg Mayer 7c4176d868 Removed trailing whitespaces from .h and .c files using the
winapi_cleanup tool written by Patrik Stridvall for the wine
project.

svn path=/trunk/; revision=6117
2002-08-28 21:04:11 +00:00
Guy Harris ccf2372350 Display NetBIOS names in standard NetBIOS-name style if they have the
right length, and display them with an error indication and using
"format_text()" if they're not ("format_text()" deals with the string
not being null-terminated, and handles non-printable characters).

svn path=/trunk/; revision=6061
2002-08-22 08:47:13 +00:00
Jörg Mayer 173fe5aef4 Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.

svn path=/trunk/; revision=5932
2002-08-02 23:36:07 +00:00
Richard Sharpe 4298a1f07d Committing Kerberos NetBIOS address type stuff from Jim McDonough.
svn path=/trunk/; revision=5908
2002-07-29 02:03:54 +00:00