changes for modified auth_context
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4156 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -101,7 +101,7 @@ krb5_get_forwarded_creds (krb5_context context,
|
||||
enctype = auth_context->enctype;
|
||||
else {
|
||||
ret = krb5_keytype_to_etype (context,
|
||||
auth_context->local_subkey.keytype,
|
||||
auth_context->local_subkey->keytype,
|
||||
&enctype);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -228,7 +228,7 @@ krb5_get_forwarded_creds (krb5_context context,
|
||||
len,
|
||||
enctype,
|
||||
0,
|
||||
&auth_context->local_subkey,
|
||||
auth_context->local_subkey,
|
||||
&cred.enc_part);
|
||||
if (ret) {
|
||||
free_KRB_CRED(&cred);
|
||||
|
@@ -61,10 +61,10 @@ krb5_mk_priv(krb5_context context,
|
||||
|
||||
/* XXX - Is this right? */
|
||||
|
||||
if (auth_context->local_subkey.keytype)
|
||||
key = &auth_context->local_subkey;
|
||||
else if (auth_context->remote_subkey.keytype)
|
||||
key = &auth_context->remote_subkey;
|
||||
if (auth_context->local_subkey->keytype)
|
||||
key = auth_context->local_subkey;
|
||||
else if (auth_context->remote_subkey->keytype)
|
||||
key = auth_context->remote_subkey;
|
||||
else
|
||||
key = auth_context->keyblock;
|
||||
|
||||
|
@@ -72,7 +72,7 @@ krb5_rd_cred (krb5_context context,
|
||||
cred.enc_part.cipher.data,
|
||||
cred.enc_part.cipher.length,
|
||||
cred.enc_part.etype,
|
||||
&auth_context->remote_subkey,
|
||||
auth_context->remote_subkey,
|
||||
&enc_krb_cred_part_data);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
@@ -68,10 +68,10 @@ krb5_rd_priv(krb5_context context,
|
||||
|
||||
/* XXX - Is this right? */
|
||||
|
||||
if (auth_context->local_subkey.keytype)
|
||||
key = &auth_context->local_subkey;
|
||||
else if (auth_context->remote_subkey.keytype)
|
||||
key = &auth_context->remote_subkey;
|
||||
if (auth_context->local_subkey->keytype)
|
||||
key = auth_context->local_subkey;
|
||||
else if (auth_context->remote_subkey->keytype)
|
||||
key = auth_context->remote_subkey;
|
||||
else
|
||||
key = auth_context->keyblock;
|
||||
|
||||
|
@@ -238,8 +238,9 @@ krb5_verify_ap_req(krb5_context context,
|
||||
/* And where should it be stored? */
|
||||
|
||||
if (ac->authenticator->subkey) {
|
||||
copy_EncryptionKey (ac->authenticator->subkey,
|
||||
&ac->remote_subkey);
|
||||
krb5_copy_keyblock(context,
|
||||
ac->authenticator->subkey,
|
||||
&ac->remote_subkey);
|
||||
}
|
||||
|
||||
if (ap_req_options) {
|
||||
|
Reference in New Issue
Block a user