From 03ff5538c9e641bad30b605bf7cec02f5f169b31 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Fri, 15 Sep 1995 18:23:25 +0000 Subject: [PATCH] Add DES_CBC_MD5 and DES_CBC_CRC with the V4 salt as default key/salt tuples to be added. (Once proven's DES_* folding code is implemented, we can shorten this list.) Eventually, this list should be read in from kdc.conf. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6793 dc483132-0cff-0310-8789-dd5450dbe970 --- src/admin/edit/ChangeLog | 7 +++++++ src/admin/edit/cpw.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index 859569cf5..c85610f10 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,10 @@ +Fri Sep 15 14:21:25 1995 Theodore Y. Ts'o + + * cpw.c: Add DES_CBC_MD5 and DES_CBC_CRC with the V4 salt as + default key/salt tuples to be added. (Once proven's DES_* + folding code is implemented, we can shorten this list.) + Eventually, this list should be read in from kdc.conf. + Thu Sep 7 20:41:24 1995 Ezra Peisach * loadv4.c (load_v4db): Provide a dummy routine if krb4 diff --git a/src/admin/edit/cpw.c b/src/admin/edit/cpw.c index 4dacbc63f..c75c73a70 100644 --- a/src/admin/edit/cpw.c +++ b/src/admin/edit/cpw.c @@ -51,8 +51,15 @@ extern char *krb5_default_pwd_prompt1, *krb5_default_pwd_prompt2; extern krb5_boolean dbactive; extern FILE *scriptfile; -static krb5_key_salt_tuple ks_tuple_rnd_def[] = {{ ENCTYPE_DES_CBC_CRC, 0 }}; -static int ks_tuple_rnd_def_count = 1; +/* + * XXX This realy should be configured from kdc.conf + */ +static krb5_key_salt_tuple ks_tuple_rnd_def[] = + {{ ENCTYPE_DES_CBC_CRC, 0 }, + { ENCTYPE_DES_CBC_MD5, 0 }, + { ENCTYPE_DES_CBC_CRC, KRB5_KDB_SALTTYPE_V4}}; + { ENCTYPE_DES_CBC_MD5, KRB5_KDB_SALTTYPE_V4}}; +static int ks_tuple_rnd_def_count = 4; static void enter_rnd_key(argc, argv, entry) -- 2.26.2