aboutsummaryrefslogtreecommitdiff
path: root/src/lib/krb5/krb/preauth.c
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1995-09-12 16:43:27 +0000
committerEzra Peisach <epeisach@mit.edu>1995-09-12 16:43:27 +0000
commit88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0 (patch)
tree22fbd2670986bdd23c988858f9baa0af2fe25515 /src/lib/krb5/krb/preauth.c
parent43ce6c50a83b8550ed083a7362fa9528e50d2fc0 (diff)
downloadkrb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.zip
krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.gz
krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.bz2
Reintegrate Macintosh changes
t_ser.c: Work around an optimizer bug in gcc under OSF/1 2.1. The timeofday calls were left in the stage as described in the ChangeLog git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6766 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb5/krb/preauth.c')
-rw-r--r--src/lib/krb5/krb/preauth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 6645976..e41399a 100644
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -122,7 +122,7 @@ krb5_obtain_padata(context, type, client, src_addr, encrypt_key, ret_data)
retval = KRB5_PREAUTH_NO_KEY;
goto error_out;
}
- krb5_use_keytype(context, &eblock, encrypt_key->keytype);
+ krb5_use_enctype(context, &eblock, encrypt_key->enctype);
/* do any necessay key pre-processing */
retval = krb5_process_key(context, &eblock, encrypt_key);
@@ -214,7 +214,7 @@ krb5_verify_padata(context, data,client,src_addr, decrypt_key, req_id, flags)
if (!decrypt_key)
return(EINVAL);
- krb5_use_keytype(context, &eblock, decrypt_key->keytype);
+ krb5_use_enctype(context, &eblock, decrypt_key->enctype);
scratch.length = data->length;
if (!(scratch.data = (char *)malloc(scratch.length))) {