* kerberos_v4.c (compat_decrypt_key): Align DES3 enctypes with

	current names.
	(kerb_get_principal): Align DES3 enctypes with current names.

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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 40d581f319a3071d0430119d0d1303b8816fc904..20281392da8eac41ec102343d9de3a086475a278 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,9 @@
+1999-08-18  Tom Yu  <tlyu@mit.edu>
+
+       * kerberos_v4.c (compat_decrypt_key): Align DES3 enctypes with
+       current names.
+       (kerb_get_principal): Align DES3 enctypes with current names.
+
 1999-06-30  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in (CFLAGS): Define NOCACHE.

diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index 4dbd4252c05dce91e27111ee5a31df231c632ddb..1ee1ba8a19513d9bbf647d559ff5d7443788dde9 100644 (file)
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -384,7 +384,7 @@ compat_decrypt_key (in5, out4, out5, issrv)
            retval = -1;
        } else {
            /* KLUDGE! If it's a non-raw des3 key, bash its enctype */
-           if (out5->enctype == ENCTYPE_DES3_HMAC_SHA1 ||
+           if (out5->enctype == ENCTYPE_DES3_CBC_SHA1 ||
                out5->enctype == ENCTYPE_LOCAL_DES3_HMAC_SHA1)
                out5->enctype = ENCTYPE_DES3_CBC_RAW;
        }
@@ -486,7 +486,7 @@ kerb_get_principal(name, inst, principal, maxn, more, k5key, kvno, issrv)
                                  ENCTYPE_LOCAL_DES3_HMAC_SHA1,
                                  -1, kvno, &pkey) &&
            krb5_dbe_find_enctype(kdc_context, &entries,
-                                 ENCTYPE_DES3_HMAC_SHA1,
+                                 ENCTYPE_DES3_CBC_SHA1,
                                  -1, kvno, &pkey) &&
            krb5_dbe_find_enctype(kdc_context, &entries,
                                  ENCTYPE_DES_CBC_CRC,