* krb524d.c (do_connection): Convert to using new symbol for

	DES3.

	* cnv_tkt_skey.c (krb524_convert_tkt_skey): Convert to using new
	symbol for DES3.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11686 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index 8789555524b8c8734f7195ae6ce7ba78ea6ff7b8..a080b78311c214659ae3b044e1bce429558d724b 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,3 +1,11 @@
+1999-08-18  Tom Yu  <tlyu@mit.edu>
+
+       * krb524d.c (do_connection): Convert to using new symbol for
+       DES3.
+
+       * cnv_tkt_skey.c (krb524_convert_tkt_skey): Convert to using new
+       symbol for DES3.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Makefile.in: Set the myfulldir and mydir variables (which are

diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c
index 4c51b6777fac2bde932d02c3a16112ffbfe0399f..fc25246cd9f6910f6c26fe0896eab84a35f102a1 100644 (file)
--- a/src/krb524/cnv_tkt_skey.c
+++ b/src/krb524/cnv_tkt_skey.c
@@ -170,7 +170,7 @@ int krb524_convert_tkt_skey(context, v5tkt, v4tkt, v5_skey, v4_skey,
                                 v4_skey->contents);
      } else {
         /* Force enctype to be raw if using DES3. */
-        if (v4_skey->enctype == ENCTYPE_DES3_HMAC_SHA1 ||
+        if (v4_skey->enctype == ENCTYPE_DES3_CBC_SHA1 ||
             v4_skey->enctype == ENCTYPE_LOCAL_DES3_HMAC_SHA1)
             v4_skey->enctype = ENCTYPE_DES3_CBC_RAW;
         ret = krb_cr_tkt_krb5(v4tkt,

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index 1afeec2dce4cb90fdad05586e6e4b4451a75460b..cad0e31609edcbecce9b3a66e6486ec0d7fb7b64 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -307,7 +307,7 @@ krb5_error_code do_connection(s, context)
                                   0,
                                   &v4_service_key, &v4kvno)) &&
         (ret = lookup_service_key(context, v5tkt->server,
-                                  ENCTYPE_DES3_HMAC_SHA1,
+                                  ENCTYPE_DES3_CBC_SHA1,
                                   0,
                                   &v4_service_key, &v4kvno)) &&
         (ret = lookup_service_key(context, v5tkt->server,