Use the etype from krb5_keytype_array[mkey]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6338 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog
index a6125e677dccea65645ad24c1b13b1d83300f799..26e6ec5ec34a964867a202a8a6f2a1a3194003ab 100644 (file)
--- a/src/krb524/ChangeLog
+++ b/src/krb524/ChangeLog
@@ -1,4 +1,9 @@
 
+Thu Jul 27 15:14:15 EDT 1995   Paul Park       (pjpark@mit.edu)
+       * krb524d.c - Use the etype which is supplied in the krb5_keytype_array
+               specified by the master key type.
+
+
 Mon Jul 17 15:15:01 EDT 1995   Paul Park       (pjpark@mit.edu)
        * krb524d.c - Add NULL stash file argument to krb5_db_fetch_mkey().
 

diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c
index da434e77b94fc6484b0a59110e81f61b4795852b..b76b283c07ba8f9776b524ce3521d99359a75dbc 100644 (file)
--- a/src/krb524/krb524d.c
+++ b/src/krb524/krb524d.c
@@ -217,13 +217,10 @@ void init_master(context)
          cleanup_and_exit(1, context);
      }
 
-#ifdef PROVIDE_DES_CBC_CRC
-     krb5_use_cstype(context, &master_encblock, ETYPE_DES_CBC_CRC);
-#else
-     error(You gotta figure out what cryptosystem to use in the KDC);
-#endif
-
      master_keyblock.keytype = KEYTYPE_DES;
+     krb5_use_cstype(context, &master_encblock,
+                    krb5_keytype_array[master_keyblock.keytype]->
+                       system->proto_enctype);
      if ((ret = krb5_db_fetch_mkey(context, master_princ, &master_encblock,
                                  FALSE, /* non-manual type-in */
                                  FALSE, /* irrelevant, given prev. arg */