* kerberos5.c : Remove krb5_enctype references, and replace with

                krb5_keytype where appropriate.

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index deedadabab16e253cd292386ff173b30e6b9d739..8a4e7e8e15d4af2f6fba4e9f47f8d068c7b636a5 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,4 +1,9 @@
 
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * kerberos5.c : Remove krb5_enctype references, and replace with
+                krb5_keytype where appropriate.
+
 Thu Aug 3 11:36:15 EDT 1995    Paul Park       (pjpark@mit.edu)
        * kerberos.c - Give the compiler something to compile when K4 disabled.
 

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 8ec35542c681e76b9a34b49d61633adf331b816e..f0df3c34ba082b94d18d2d0bf0c5ba09cc5d558e 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -175,7 +175,6 @@ kerberos5_init(ap, server)
                str_data[3] = TELQUAL_IS;
        memset(&session_key, 0, sizeof(session_key));
        session_key.magic = KV5M_KEYBLOCK;
-       session_key.etype = ETYPE_UNKNOWN;
        if (telnet_context == 0)
            krb5_init_context(&telnet_context);
         krb5_init_ets(telnet_context);
@@ -282,7 +281,7 @@ kerberos5_send(ap)
         * keep the key in our private storage, but don't use it yet
         * ---see kerberos5_reply() below 
         */
-       if (newkey && (newkey->keytype != KEYTYPE_DES)) {
+       if (newkey) {
            if (new_creds->keyblock.keytype == KEYTYPE_DES)
                /* use the session key in credentials instead */
                krb5_copy_keyblock_contents(telnet_context, 
@@ -403,23 +402,18 @@ kerberos5_is(ap, data, cnt)
                    free(name);
                krb5_auth_con_getremotesubkey(telnet_context, auth_context,
                                              &newkey);
-               if (newkey && newkey->keytype == KEYTYPE_DES) {
+               if (newkey) {
                    if (session_key.contents)
                        free(session_key.contents);
                    krb5_copy_keyblock_contents(telnet_context, newkey,
                                                &session_key);
                    krb5_free_keyblock(telnet_context, newkey);
                } else {
-                   if (newkey)
-                       krb5_free_keyblock(telnet_context, newkey);
-                   if (ticket->enc_part2->session->keytype == KEYTYPE_DES) {
-                       if (session_key.contents)
-                           free(session_key.contents);
-                       krb5_copy_keyblock_contents(telnet_context, 
+                   if (session_key.contents)
+                       free(session_key.contents);
+                   krb5_copy_keyblock_contents(telnet_context, 
                                           ticket->enc_part2->session,
                                           &session_key);
-                   } else
-                       break;
                }
                
 #ifdef ENCRYPTION