* 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

diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog
index d8554835b77d93f9e6673eaf07956920754d7612..e7b35b9a896de18a6ec4ed3259bc3cc369c7e4ea 100644 (file)
--- 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 91beaba6ef888b9916afe19a92be7d55988d5179..fdffa737b8639d009b6da563ed165c501f90c2e2 100644 (file)
--- 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 3d3e128c117657de9c2faa4f39d6eefbfaf48532..598739aec384c7607c8ad91b0242c023ae7422f3 100644 (file)
--- 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  <epeisach@kangaroo.mit.edu>
 
        * rlogin.M: Document -f and -F options.

diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index eaf65a2f3c5f95498a4b2546664fa8a774c6b57c..c5e0c8afc1ed5828bd0cee2c7556d0f25ca1de88 100644 (file)
--- 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 204480aaebd3b8a69f94a50e22c1b9ba83a7fbdf..135fa26069e64f88b0501e9b992be5c917cf07e1 100644 (file)
--- 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 a4de216caa0ce5e74a9babf8eefaae02167ca6aa..4e714ad9fefe797d7922d5c1f79d93891d69caf5 100644 (file)
--- 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 c60ddba9fa097ad56645a22d7c07465b9fabc07e..cb847a5785c617932c93f6a5bf4066cfa437672f 100644 (file)
--- 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 801c4068d369a7dcce658c11cbd20bf85a9bc763..fae36064845342f7d3844ea94f461af847db2903 100644 (file)
--- 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");