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

This reverts commit 03484706e4ff546fc7fe41124d896e9f7840fe80.

diff --git a/source4/heimdal/kdc/kerberos5.c b/source4/heimdal/kdc/kerberos5.c
index db2c6262116ed8042093253829180d0cd2938dd8..3282d5e08006dde63d9092e9907034e4d173a288 100644 (file)
--- a/source4/heimdal/kdc/kerberos5.c
+++ b/source4/heimdal/kdc/kerberos5.c
@@ -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);

diff --git a/source4/heimdal/kdc/krb5tgs.c b/source4/heimdal/kdc/krb5tgs.c
index a71cfbff66cea333381fd456b9db07373ac439ba..d59eb9731bee0261cef6bff3374996d92e43d8e9 100644 (file)
--- a/source4/heimdal/kdc/krb5tgs.c
+++ b/source4/heimdal/kdc/krb5tgs.c
@@ -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);