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/gen_subkey.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/gen_subkey.c')
-rw-r--r-- | src/lib/krb5/krb/gen_subkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/krb5/krb/gen_subkey.c b/src/lib/krb5/krb/gen_subkey.c index 9d8ad84f44..66a79d19e9 100644 --- a/src/lib/krb5/krb/gen_subkey.c +++ b/src/lib/krb5/krb/gen_subkey.c @@ -36,10 +36,10 @@ krb5_generate_subkey(context, key, subkey) krb5_encrypt_block eblock; krb5_error_code retval; - if (!valid_keytype(key->keytype)) - return KRB5_PROG_KEYTYPE_NOSUPP; + if (!valid_enctype(key->enctype)) + return KRB5_PROG_ETYPE_NOSUPP; - krb5_use_keytype(context, &eblock, key->keytype); + krb5_use_enctype(context, &eblock, key->enctype); if ((retval = krb5_init_random_key(context, &eblock, key, &random_state))) return(retval); |