merge new-crypto branch

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5332 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-02-11 21:03:59 +00:00
parent 0a6c3f7fde
commit aaae186ab9
83 changed files with 4175 additions and 1509 deletions

View File

@@ -42,8 +42,8 @@ RCSID("$Id$");
krb5_error_code
krb5_keytab_key_proc (krb5_context context,
krb5_keytype type,
krb5_data *salt,
krb5_enctype enctype,
krb5_salt salt,
krb5_const_pointer keyseed,
krb5_keyblock **key)
{
@@ -60,7 +60,7 @@ krb5_keytab_key_proc (krb5_context context,
real_keytab = keytab;
ret = krb5_kt_get_entry (context, real_keytab, principal,
0, type, &entry);
0, enctype, &entry);
if (keytab == NULL)
krb5_kt_close (context, real_keytab);