diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-01 20:33:09 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-01 20:33:09 +0000 |
| commit | 072213711dd58d72402396178925ce891abdfbdc (patch) | |
| tree | 19c7565bd4eab3394218efdc556c00e8d2fba4ca /asn1/kerberos | |
| parent | e472e2cca9c541b02b401bd8b215b7a3946e54fa (diff) | |
Add to the ASN1 kerberos changes made in the non-asn1 version of kerberos
(the changes comitted in SVN #31400 which fixed bug #4363).
[I hope I've done this properly.... :) ]
svn path=/trunk/; revision=31402
Diffstat (limited to 'asn1/kerberos')
| -rw-r--r-- | asn1/kerberos/kerberos.cnf | 1 | ||||
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asn1/kerberos/kerberos.cnf b/asn1/kerberos/kerberos.cnf index 1e2377a1ff..624b716833 100644 --- a/asn1/kerberos/kerberos.cnf +++ b/asn1/kerberos/kerberos.cnf @@ -67,7 +67,6 @@ guint32 msgtype; %(DEFAULT_BODY)s -krb_PA_DATA_type&=0xff; /*this is really just one single byte */ if(tree){ proto_item_append_text(tree, " %%s", val_to_str(krb_PA_DATA_type, krb5_preauthentication_types, diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 2d3cc0f7c5..a30384b633 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -841,12 +841,13 @@ g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num); #define KRB5_TD_REQ_NONCE 107 #define KRB5_TD_REQ_SEQ 108 /* preauthentication types >127 (i.e. negative ones) are app specific. - hopefully there will be no collissions here or we will have to - come up with something better + Hopefully there will be no collisions here or we will have to + come up with something better. + Note: These values are compared against 32-bit values in the code. */ -#define KRB5_PA_PAC_REQUEST 128 /* MS extension */ -#define KRB5_PA_S4U2SELF 129 /* Impersonation (Microsoft extension) */ -#define KRB5_PA_PROV_SRV_LOCATION 255 /* packetcable stuff */ +#define KRB5_PA_PAC_REQUEST -128 /* = 0xFFFFFF80 = (gint32)((gint8)0x80) MS extension */ +#define KRB5_PA_S4U2SELF -127 /* = 0xFFFFFF81 = (gint32)((gint8)0x81) Impersonation (Microsoft extension) */ +#define KRB5_PA_PROV_SRV_LOCATION -1 /* = 0xFFFFFFFF = (gint32)((gint8)0xFF) packetcable stuff */ /* Principal name-type */ #define KRB5_NT_UNKNOWN 0 |