No need to have the session_key established for mutual authentication

to work.  (That's only done if ENCRYPTION is defined.)

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

diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog
index 00ac6b339c0b23231564f90be4c72c7c299f569b..135af39fd5510e319c19f15748e7a0041fdc5b8c 100644 (file)
--- a/src/appl/telnet/libtelnet/ChangeLog
+++ b/src/appl/telnet/libtelnet/ChangeLog
@@ -1,5 +1,9 @@
 Wed Mar 29 15:08:43 1995  Theodore Y. Ts'o  (tytso@dcl)
 
+       * kerberos5.c: No need to have the session_key established for
+               mutual authentication to work.  (That's only done if
+               ENCRYPTION is defined.)
+
        * auth.c (authenticators): Allow mutual authentication even if the
                ENCRYPTION option is not turned on.
 

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index 51e12ad0e7d41d30f4f7a14d7bcaf5dbdcf9f599..6b822b427c6fb719147b591b9cc35b128f57b46f 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -455,12 +455,6 @@ kerberos5_reply(ap, data, cnt)
                    inbuf.length = cnt;
                    inbuf.data = (char *)data;
 
-                   if (!session_key.contents) {
-                       printf("[ Mutual authentication failed: no session key ]\n");
-                       auth_send_retry();
-                       return;
-                   }
-                       
                    if (r = krb5_rd_rep(telnet_context, auth_context, &inbuf,
                                        &reply)) {
                        printf("[ Mutual authentication failed: %s ]\n",
@@ -470,10 +464,12 @@ kerberos5_reply(ap, data, cnt)
                    }
                    krb5_free_ap_rep_enc_part(telnet_context, reply);
 #ifdef ENCRYPTION
+                   if (!session_key.contents) {
                        skey.type = SK_DES;
                        skey.length = 8;
                        skey.data = session_key.contents;
                        encrypt_session_key(&skey, 0);
+                     }
 #endif /* ENCRYPTION */
                    mutual_complete = 1;
                }