Ethereal-dev: Re: [Ethereal-dev] warnings in latest CVS packet-kerberos.c

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Jean-Baptiste Marchand <Jean-Baptiste.Marchand@xxxxxx>
Date: Tue, 15 Jun 2004 11:07:51 +0200
Hello,

the attached diff should fix the problem (based on the following
definitions in ntsecapi.h):

#define KERB_ETYPE_DES_CBC_MD5_NT                          20
#define KERB_ETYPE_RC4_PLAIN2       -129

Thanks to Ronnie for working on this.

Jean-Baptiste Marchand
-- 
Jean-Baptiste.Marchand@xxxxxx
HSC - http://www.hsc.fr/

Index: packet-kerberos.c
===================================================================
RCS file: /cvsroot/ethereal/packet-kerberos.c,v
retrieving revision 1.70
diff -u -r1.70 packet-kerberos.c
--- packet-kerberos.c	10 Jun 2004 13:33:50 -0000	1.70
+++ packet-kerberos.c	15 Jun 2004 08:57:19 -0000
@@ -481,7 +481,7 @@
 #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV     14
 #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV    15
 #define KRB5_ENCTYPE_DES3_CBC_SHA1       16
-#define KRB5_ENCTYPE_DES_CBC_MD5         20
+#define KRB5_ENCTYPE_DES_CBC_MD5_NT      20
 #define KERB_ENCTYPE_RC4_HMAC            23 
 #define KERB_ENCTYPE_RC4_HMAC_EXP        24
 #define KRB5_ENCTYPE_UNKNOWN                0x1ff
@@ -495,7 +495,7 @@
 #define KRB5_ENCTYPE_DES_PLAIN		0xffffff7c
 #define KRB5_ENCTYPE_RC4_SHA		0xffffff7d
 #define KRB5_ENCTYPE_RC4_LM		0xffffff7e
-#define KRB5_ENCTYPE_RC4_PLAIN		0xffffff7f
+#define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
 #define KRB5_ENCTYPE_RC4_MD4		0xffffff80
 
 /* checksum types */
@@ -804,7 +804,7 @@
     { KRB5_ENCTYPE_RSA_ES_OEAP_ENV, "rsa-es-oeap-env" },
     { KRB5_ENCTYPE_DES_EDE3_CBC_ENV, "des-ede3-cbc-env" },
     { KRB5_ENCTYPE_DES3_CBC_SHA1  , "des3-cbc-sha1" },
-    { KRB5_ENCTYPE_DES_CBC_MD5    , "des-cbc-md5" },
+    { KRB5_ENCTYPE_DES_CBC_MD5_NT  , "des-cbc-md5-nt" },
     { KERB_ENCTYPE_RC4_HMAC       , "rc4-hmac" },
     { KERB_ENCTYPE_RC4_HMAC_EXP   , "rc4-hmac-exp" },
     { KRB5_ENCTYPE_UNKNOWN        , "unknown" },
@@ -818,7 +818,7 @@
     { KRB5_ENCTYPE_DES_PLAIN      , "des-plain" },
     { KRB5_ENCTYPE_RC4_SHA        , "rc4-sha" },
     { KRB5_ENCTYPE_RC4_LM         , "rc4-lm" },
-    { KRB5_ENCTYPE_RC4_PLAIN      , "rc4-plain" },
+    { KRB5_ENCTYPE_RC4_PLAIN2     , "rc4-plain2" },
     { KRB5_ENCTYPE_RC4_MD4        , "rc4-md4" },
     { 0                           , NULL },
 };