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

@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997 Kungliga Tekniska H<>gskolan
* Copyright (c) 1997, 1998 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved.
*
@@ -82,9 +82,8 @@ krb5_mk_req(krb5_context context,
if (r)
return r;
this_cred.times.endtime = 0;
if (auth_context && *auth_context && (*auth_context)->enctype)
krb5_etype_to_keytype(context, (*auth_context)->enctype,
&this_cred.session.keytype);
if (auth_context && *auth_context && (*auth_context)->keyblock)
this_cred.session.keytype = (*auth_context)->keyblock->keytype;
r = krb5_get_credentials (context, 0, ccache, &this_cred, &cred);
if (r)