sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

Revert "HEIMDAL:kdc: let _kdc_encode_reply() use the encryption type based on the server key"

Browse Source 
This reverts commit 03484706e4ff546fc7fe41124d896e9f7840fe80.
This commit is contained in:
Karolin Seeger 2018-02-21 10:15:22 +01:00
parent 4afb9bddeb
commit fb65808bb2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/heimdal/kdc/kerberos5.c
View File

@ -322,6 +322,7 @@ krb5_error_code
_kdc_encode_reply(krb5_context context,
krb5_kdc_configuration *config,
KDC_REP *rep, const EncTicketPart *et, EncKDCRepPart *ek,
krb5_enctype etype,
int skvno, const EncryptionKey *skey,
int ckvno, const EncryptionKey *reply_key,
int rk_is_subkey,
@ -348,7 +349,7 @@ _kdc_encode_reply(krb5_context context,
return KRB5KRB_ERR_GENERIC;
}
ret = krb5_crypto_init(context, skey, 0, &crypto);
ret = krb5_crypto_init(context, skey, etype, &crypto);
if (ret) {
const char *msg;
free(buf);
@ -1719,7 +1720,7 @@ _kdc_as_rep(krb5_context context,
log_as_req(context, config, reply_key->keytype, setype, b);
ret = _kdc_encode_reply(context, config,
&rep, &et, &ek, server->entry.kvno,
&rep, &et, &ek, setype, server->entry.kvno,
&skey->key, client->entry.kvno,
reply_key, 0, &e_text, reply);
free_EncTicketPart(&et);

2
source4/heimdal/kdc/krb5tgs.c
View File

@ -987,7 +987,7 @@ tgs_make_reply(krb5_context context,
etype list, even if we don't want a session key with
DES3? */
ret = _kdc_encode_reply(context, config,
&rep, &et, &ek,
&rep, &et, &ek, et.key.keytype,
kvno,
serverkey, 0, replykey, rk_is_subkey,
e_text, reply);