diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 16:43:27 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-09-12 16:43:27 +0000 |
| commit | 88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0 (patch) | |
| tree | 22fbd2670986bdd23c988858f9baa0af2fe25515 /src/lib/krb5/krb/mk_cred.c | |
| parent | 43ce6c50a83b8550ed083a7362fa9528e50d2fc0 (diff) | |
| download | krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.gz krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.tar.xz krb5-88ebe65e3ecce63cf5bcc86804d9c53ace1efcb0.zip | |
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/mk_cred.c')
| -rw-r--r-- | src/lib/krb5/krb/mk_cred.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c index 9d2ef6d8e0..5e399a1068 100644 --- a/src/lib/krb5/krb/mk_cred.c +++ b/src/lib/krb5/krb/mk_cred.c @@ -31,7 +31,7 @@ encrypt_credencpart(context, pcredpart, pkeyblock, pencdata) krb5_encrypt_block eblock; krb5_data * scratch; - if (!valid_etype(pkeyblock->etype)) + if (!valid_enctype(pkeyblock->enctype)) return KRB5_PROG_ETYPE_NOSUPP; /* start by encoding to-be-encrypted part of the message */ @@ -41,9 +41,9 @@ encrypt_credencpart(context, pcredpart, pkeyblock, pencdata) /* put together an eblock for this encryption */ pencdata->kvno = 0; - pencdata->etype = pkeyblock->etype; + pencdata->enctype = pkeyblock->enctype; - krb5_use_cstype(context, &eblock, pkeyblock->etype); + krb5_use_enctype(context, &eblock, pkeyblock->enctype); pencdata->ciphertext.length = krb5_encrypt_size(scratch->length, eblock.crypto_entry); |