diff options
| author | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:21:12 +0000 |
|---|---|---|
| committer | Chris Provenzano <proven@mit.edu> | 1995-09-06 03:21:12 +0000 |
| commit | 941d1d38ad8cb0838fc6bf19d5c2f8a76bbe22af (patch) | |
| tree | fba9a551349558409ebdd8a6cdf6aeb8bd704050 /src | |
| parent | 8a54fb8b7c2b1a54401bac2b0a7496dbe9f1625d (diff) | |
| download | krb5-941d1d38ad8cb0838fc6bf19d5c2f8a76bbe22af.tar.gz krb5-941d1d38ad8cb0838fc6bf19d5c2f8a76bbe22af.tar.xz krb5-941d1d38ad8cb0838fc6bf19d5c2f8a76bbe22af.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/telnet/libtelnet/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/telnet/libtelnet/kerberos5.c | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index deedadaba..8a4e7e8e1 100644 --- 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 8ec35542c..f0df3c34b 100644 --- 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 |