From: Chris Provenzano <proven@mit.edu>
Date: Wed, 6 Sep 1995 19:00:37 +0000 (+0000)
Subject:         * encrypt.h, kerberos5.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
X-Git-Tag: krb5-1.0-beta6~1161
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c70008d314315d1d88ec9b3d1e449336a5c31e63;p=krb5.git

    * encrypt.h, kerberos5.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 8a4e7e8e1..112652159 100644
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,3 +1,6 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * encrypt.h, kerberos5.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
 
 Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
 
diff --git a/src/appl/telnet/libtelnet/encrypt.h b/src/appl/telnet/libtelnet/encrypt.h
index 6eec238a2..d4274d8ca 100644
--- a/src/appl/telnet/libtelnet/encrypt.h
+++ b/src/appl/telnet/libtelnet/encrypt.h
@@ -97,7 +97,7 @@ typedef struct {
 	void	(*printsub) P((unsigned char *, int, unsigned char *, int));
 } Encryptions;
 
-#define	SK_DES		1	/* Matched Kerberos v5 KEYTYPE_DES */
+#define	SK_DES		1	/* Matched Kerberos v5 ENCTYPE_DES */
 
 #include "enc-proto.h"
 
diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index f0df3c34b..dbc9c7f80 100644
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -282,7 +282,7 @@ kerberos5_send(ap)
 	 * ---see kerberos5_reply() below 
 	 */
 	if (newkey) {
-	    if (new_creds->keyblock.keytype == KEYTYPE_DES)
+	    if (new_creds->keyblock.enctype == ENCTYPE_DES)
 		/* use the session key in credentials instead */
 		krb5_copy_keyblock_contents(telnet_context, 
 					    &new_creds->keyblock,