(krb5_build_authenticator): enctype as a parameter instead of guessing
it. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4013 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -43,6 +43,7 @@ RCSID("$Id$");
|
|||||||
krb5_error_code
|
krb5_error_code
|
||||||
krb5_build_authenticator (krb5_context context,
|
krb5_build_authenticator (krb5_context context,
|
||||||
krb5_auth_context auth_context,
|
krb5_auth_context auth_context,
|
||||||
|
krb5_enctype enctype,
|
||||||
krb5_creds *cred,
|
krb5_creds *cred,
|
||||||
Checksum *cksum,
|
Checksum *cksum,
|
||||||
Authenticator **auth_result,
|
Authenticator **auth_result,
|
||||||
@@ -52,17 +53,6 @@ krb5_build_authenticator (krb5_context context,
|
|||||||
unsigned char buf[1024];
|
unsigned char buf[1024];
|
||||||
size_t len;
|
size_t len;
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
krb5_enctype enctype;
|
|
||||||
|
|
||||||
if (auth_context->enctype)
|
|
||||||
enctype = auth_context->enctype;
|
|
||||||
else {
|
|
||||||
ret = krb5_keytype_to_etype(context,
|
|
||||||
cred->session.keytype,
|
|
||||||
&enctype);
|
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
auth = malloc(sizeof(*auth));
|
auth = malloc(sizeof(*auth));
|
||||||
if (auth == NULL)
|
if (auth == NULL)
|
||||||
|
Reference in New Issue
Block a user