From 24b5882941d5adb0c3d467065960ddb8cddb84c8 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 19:00:09 +0000 Subject: [PATCH] * kdb5_stash.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6699 dc483132-0cff-0310-8789-dd5450dbe970 --- src/admin/stash/ChangeLog | 3 +++ src/admin/stash/kdb5_stash.c | 28 ++++++++++++++-------------- src/appl/bsd/ChangeLog | 5 +++++ src/appl/bsd/krcp.c | 4 ++-- src/appl/bsd/krlogin.c | 2 +- src/appl/bsd/krlogind.c | 4 ++-- src/appl/bsd/krsh.c | 2 +- src/appl/bsd/krshd.c | 2 +- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog index d8554835b..e7b35b9a8 100644 --- a/src/admin/stash/ChangeLog +++ b/src/admin/stash/ChangeLog @@ -1,3 +1,6 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * kdb5_stash.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/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c index 91beaba6e..fdffa737b 100644 --- a/src/admin/stash/kdb5_stash.c +++ b/src/admin/stash/kdb5_stash.c @@ -41,7 +41,7 @@ usage(who, status) char *who; int status; { - fprintf(stderr, "usage: %s [-d dbpathname] [-r realmname] [-k keytype]\n\ + fprintf(stderr, "usage: %s [-d dbpathname] [-r realmname] [-k enctype]\n\ \t[-M mkeyname] [-f keyfile]\n", who); exit(status); @@ -64,7 +64,7 @@ char *argv[]; krb5_context context; krb5_realm_params *rparams; - int keytypedone = 0; + int enctypedone = 0; if (strrchr(argv[0], '/')) argv[0] = strrchr(argv[0], '/')+1; @@ -81,10 +81,10 @@ char *argv[]; realm = optarg; break; case 'k': - if (!krb5_string_to_keytype(optarg, &master_keyblock.keytype)) - keytypedone++; + if (!krb5_string_to_enctype(optarg, &master_keyblock.enctype)) + enctypedone++; else - com_err(argv[0], 0, "%s is an invalid keytype", optarg); + com_err(argv[0], 0, "%s is an invalid enctype", optarg); break; case 'M': /* master key name in DB */ mkey_name = optarg; @@ -117,9 +117,9 @@ char *argv[]; mkey_name = strdup(rparams->realm_mkey_name); /* Get the value for the master key type */ - if (rparams->realm_keytype_valid && !keytypedone) { - master_keyblock.keytype = rparams->realm_keytype; - keytypedone++; + if (rparams->realm_enctype_valid && !enctypedone) { + master_keyblock.enctype = rparams->realm_enctype; + enctypedone++; } /* Get the value for the stash file */ @@ -132,20 +132,20 @@ char *argv[]; if (!dbname) dbname = DEFAULT_KDB_FILE; - if (!keytypedone) - master_keyblock.keytype = DEFAULT_KDC_KEYTYPE; + if (!enctypedone) + master_keyblock.enctype = DEFAULT_KDC_ENCTYPE; - if (!valid_keytype(master_keyblock.keytype)) { + if (!valid_enctype(master_keyblock.enctype)) { char tmp[32]; - if (krb5_keytype_to_string(master_keyblock.keytype, tmp, sizeof(tmp))) + if (krb5_enctype_to_string(master_keyblock.enctype, tmp, sizeof(tmp))) com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, - "while setting up keytype %d", master_keyblock.keytype); + "while setting up enctype %d", master_keyblock.enctype); else com_err(argv[0], KRB5_PROG_KEYTYPE_NOSUPP, tmp); exit(1); } - krb5_use_keytype(context, &master_encblock, master_keyblock.keytype); + krb5_use_enctype(context, &master_encblock, master_keyblock.enctype); if (retval = krb5_db_set_name(context, dbname)) { com_err(argv[0], retval, "while setting active database to '%s'", diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 3d3e128c1..598739aec 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,8 @@ +Wed Sep 06 14:20:57 1995 Chris Provenzano (proven@mit.edu) + + * krcp.c, krlogin.c, krlogind.c, krsh.c, krshd.c : + s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g + Sun Aug 27 15:35:04 1995 Ezra Peisach * rlogin.M: Document -f and -F options. diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c index eaf65a2f3..c5e0c8afc 100644 --- a/src/appl/bsd/krcp.c +++ b/src/appl/bsd/krcp.c @@ -1324,7 +1324,7 @@ void send_auth() &session_key); krb5_free_creds(bsd_context, out_creds); - krb5_use_keytype(bsd_context, &eblock, session_key->keytype); + krb5_use_enctype(bsd_context, &eblock, session_key->enctype); if ( status = krb5_process_key(bsd_context, &eblock, session_key)){ fprintf(stderr, "rcp: send_auth failed krb5_process_key: %s\n", @@ -1401,7 +1401,7 @@ void krb5_xfree(msg.data); /* OK process key */ - krb5_use_keytype(bsd_context, &eblock, session_key->keytype); + krb5_use_enctype(bsd_context, &eblock, session_key->enctype); if (status = krb5_process_key(bsd_context, &eblock, session_key)) exit(1); diff --git a/src/appl/bsd/krlogin.c b/src/appl/bsd/krlogin.c index 204480aae..135fa2606 100644 --- a/src/appl/bsd/krlogin.c +++ b/src/appl/bsd/krlogin.c @@ -580,7 +580,7 @@ main(argc, argv) rem = sock; /* setup eblock for des_read and write */ - krb5_use_keytype(bsd_context, &eblock,cred->keyblock.keytype); + krb5_use_enctype(bsd_context, &eblock,cred->keyblock.enctype); if ( status = krb5_process_key(bsd_context, &eblock,&cred->keyblock)) { fprintf(stderr, "%s: Cannot process session key : %s.\n", diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index a4de216ca..4e714ad9f 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -1550,8 +1550,8 @@ recvauth() /* Setup up eblock if encrypted login session */ /* otherwise zero out session key */ if (do_encrypt) { - krb5_use_keytype(bsd_context, &eblock, - ticket->enc_part2->session->keytype); + krb5_use_enctype(bsd_context, &eblock, + ticket->enc_part2->session->enctype); if (status = krb5_process_key(bsd_context, &eblock, ticket->enc_part2->session)) fatal(netf, "Permission denied"); diff --git a/src/appl/bsd/krsh.c b/src/appl/bsd/krsh.c index c60ddba9f..cb847a578 100644 --- a/src/appl/bsd/krsh.c +++ b/src/appl/bsd/krsh.c @@ -361,7 +361,7 @@ main(argc, argv0) /* Setup for des_read and write */ desinbuf.data = des_inbuf; desoutbuf.data = des_outbuf; - krb5_use_keytype(bsd_context, &eblock,cred->keyblock.keytype); + krb5_use_enctype(bsd_context, &eblock,cred->keyblock.enctype); if (status = krb5_process_key(bsd_context, &eblock,&cred->keyblock)) { fprintf(stderr, "%s: Cannot process session key : %s.\n", argv0, error_message(status)); diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index 801c4068d..fae360648 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -1688,7 +1688,7 @@ recvauth(netf, peersin) return status; /* Setup eblock for encrypted sessions. */ - krb5_use_keytype(bsd_context, &eblock, ticket->enc_part2->session->keytype); + krb5_use_enctype(bsd_context, &eblock, ticket->enc_part2->session->enctype); if (status = krb5_process_key(bsd_context, &eblock, ticket->enc_part2->session)) fatal(netf, "Permission denied"); -- 2.26.2