From d5a7ab2e94f063aaec8093975f70ae031c6242f9 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 19:03:08 +0000 Subject: [PATCH] * admin.c, passwd.c, srv_key.c, srv_main.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6706 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/v5server/ChangeLog | 4 ++++ src/kadmin/v5server/admin.c | 22 ++++++++--------- src/kadmin/v5server/passwd.c | 4 ++-- src/kadmin/v5server/srv_key.c | 44 +++++++++++++++++----------------- src/kadmin/v5server/srv_main.c | 10 ++++---- 5 files changed, 44 insertions(+), 40 deletions(-) diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index 509706ba5..59bcdb79e 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,3 +1,7 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * admin.c, passwd.c, srv_key.c, srv_main.c : + s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g Tue Sep 05 22:10:34 1995 Chris Provenzano (proven@mit.edu) diff --git a/src/kadmin/v5server/admin.c b/src/kadmin/v5server/admin.c index f0d228e19..76304f8f0 100644 --- a/src/kadmin/v5server/admin.c +++ b/src/kadmin/v5server/admin.c @@ -230,15 +230,15 @@ admin_merge_keys(kcontext, dbentp, unique, xxx2.n_key_data = nkeys2; xxx2.key_data = in2; for (i=0; in_key_data; for (i=0; ikey_data = dkey_list; dbentp->n_key_data = num_dkeys; for (i=0; ikey_data_length[0]; madmin_key.contents = kdata->key_data_contents[0]; } @@ -372,7 +372,7 @@ key_init(kcontext, debug_level, key_type, master_key_name, manual, /* * Figure out arguments. */ - master_keyblock.keytype=((key_type == -1) ? KEYTYPE_DES_CBC_MD5 : key_type); + master_keyblock.enctype=((key_type == -1) ? ENCTYPE_DES_CBC_MD5 : key_type); mkey_name = ((!master_key_name) ? KRB5_KDB_M_NAME : master_key_name); /* @@ -471,7 +471,7 @@ key_init(kcontext, debug_level, key_type, master_key_name, manual, } ment_init = 1; - krb5_use_keytype(kcontext, &master_encblock, master_keyblock.keytype); + krb5_use_enctype(kcontext, &master_encblock, master_keyblock.enctype); /* Go get the master key */ kret = krb5_db_fetch_mkey(kcontext, @@ -653,10 +653,10 @@ key_string2key_keysalt(ksent, ptr) * Determine if this key/salt pair is salted. */ salted = 0; - krb5_use_keytype(argp->context, &master_encblock, ksent->ks_keytype); - if (!krb5_dbe_find_keytype(argp->context, + krb5_use_enctype(argp->context, &master_encblock, ksent->ks_enctype); + if (!krb5_dbe_find_enctype(argp->context, argp->dbentry, - ksent->ks_keytype, + ksent->ks_enctype, ksent->ks_salttype, -1, &kdata)) { @@ -670,7 +670,7 @@ key_string2key_keysalt(ksent, ptr) */ if (!(kret = krb5_dbe_create_key_data(argp->context, argp->dbentry))) { kdata = &argp->dbentry->key_data[argp->dbentry->n_key_data-1]; - kdata->key_data_type[0] = (krb5_int16) ksent->ks_keytype; + kdata->key_data_type[0] = (krb5_int16) ksent->ks_enctype; kdata->key_data_type[1] = (krb5_int16) ksent->ks_salttype; } } @@ -843,10 +843,10 @@ key_randomkey_keysalt(ksent, ptr) argp = (struct keysalt_iterate_args *) ptr; kret = 0; - krb5_use_keytype(argp->context, &master_encblock, ksent->ks_keytype); - if (krb5_dbe_find_keytype(argp->context, + krb5_use_enctype(argp->context, &master_encblock, ksent->ks_enctype); + if (krb5_dbe_find_enctype(argp->context, argp->dbentry, - ksent->ks_keytype, + ksent->ks_enctype, ksent->ks_salttype, -1, &kdata)) { @@ -856,7 +856,7 @@ key_randomkey_keysalt(ksent, ptr) */ if (!(kret = krb5_dbe_create_key_data(argp->context, argp->dbentry))) { kdata = &argp->dbentry->key_data[argp->dbentry->n_key_data-1]; - kdata->key_data_type[0] = (krb5_int16) ksent->ks_keytype; + kdata->key_data_type[0] = (krb5_int16) ksent->ks_enctype; kdata->key_data_type[1] = (krb5_int16) 0; } } @@ -969,11 +969,11 @@ key_encrypt_keys(kcontext, dbentp, nkeysp, inkeys, outkeysp) ndone = 0; nkeys = *nkeysp; for (i=0; ikey_data[i]. key_data_type[1])) continue; - ksp[num].ks_keytype = dbentp->key_data[i].key_data_type[0]; + ksp[num].ks_enctype = dbentp->key_data[i].key_data_type[0]; ksp[num].ks_salttype = dbentp->key_data[i].key_data_type[1]; num++; } diff --git a/src/kadmin/v5server/srv_main.c b/src/kadmin/v5server/srv_main.c index ce3c145af..bb63cca41 100644 --- a/src/kadmin/v5server/srv_main.c +++ b/src/kadmin/v5server/srv_main.c @@ -38,10 +38,10 @@ #include "kadm5_defs.h" #ifdef LANGUAGES_SUPPORTED -static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-m]\n\t[-k mkeytype] [-l langlist] [-p portnum] [-r realm] [-s stash] [-t timeout] [-n]\n\t[-D dbg] [-M mkeyname] [-T ktabname].\n"; +static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-m]\n\t[-k menctype] [-l langlist] [-p portnum] [-r realm] [-s stash] [-t timeout] [-n]\n\t[-D dbg] [-M mkeyname] [-T ktabname].\n"; static const char *getopt_string = "a:d:e:k:l:mnp:r:t:D:M:T:"; #else /* LANGUAGES_SUPPORTED */ -static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-m]\n\t[-k mkeytype] [-p portnum] [-r realm] [-s stash] [-t timeout] [-n]\n\t[-D dbg] [-M mkeyname] [-T ktabname].\n"; +static const char *usage_format = "%s: usage is %s [-a aclfile] [-d database] [-m]\n\t[-k menctype] [-p portnum] [-r realm] [-s stash] [-t timeout] [-n]\n\t[-D dbg] [-M mkeyname] [-T ktabname].\n"; static const char *getopt_string = "a:d:e:k:mnp:r:t:D:M:T:"; #endif /* LANGUAGES_SUPPORTED */ static const char *fval_not_number = "%s: value (%s) specified for -%c is not numeric.\n"; @@ -136,7 +136,7 @@ main(argc, argv) * kadmind5 [-a aclfile] * [-d database] * [-e enctype] - * [-k masterkeytype] + * [-k masterenctype] * [-l languagelist] * [-m] * [-n] @@ -268,8 +268,8 @@ main(argc, argv) master_key_name = strdup(rparams->realm_mkey_name); /* Get the value for the master key type */ - if (rparams->realm_keytype_valid) - key_type = rparams->realm_keytype; + if (rparams->realm_enctype_valid) + key_type = rparams->realm_enctype; /* Get the value for the port */ if (rparams->realm_kadmind_port_valid) -- 2.26.2