* admin_server.c, kadm_funcs.c kadm_ser_wrap.c :

		s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog
index f18bd607740fcb033723cb06cb8053b3ce59e343..f52d7ee8dbaf2180861596cad424e67e5ef6a9cf 100644 (file)
--- a/src/kadmin.v4/server/ChangeLog
+++ b/src/kadmin.v4/server/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * admin_server.c, kadm_funcs.c kadm_ser_wrap.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.v4/server/admin_server.c b/src/kadmin.v4/server/admin_server.c
index b745fee185d5828bcf274237d5ea266fdb98db4c..c8d960a0ed93302316ea662ea6c830df26b18b00 100644 (file)
--- a/src/kadmin.v4/server/admin_server.c
+++ b/src/kadmin.v4/server/admin_server.c
@@ -380,14 +380,14 @@ struct sockaddr_in *who;
        cleanexit(2);
     }
 
-    status = krb5_dbe_find_keytype(kadm_context,
+    status = krb5_dbe_find_enctype(kadm_context,
                                   &sprinc_entries,
-                                  KEYTYPE_DES_CBC_MD5,
+                                  ENCTYPE_DES_CBC_MD5,
                                   -1,
                                   -1,
                                   &kdatap);
     if (status) {
-       syslog(LOG_ERR, "find keytype failed: %s", error_message(status));
+       syslog(LOG_ERR, "find enctype failed: %s", error_message(status));
        cleanexit(1);
     }
 

diff --git a/src/kadmin.v4/server/kadm_funcs.c b/src/kadmin.v4/server/kadm_funcs.c
index bdeccf988fc873a26b564d58a09fa57b127e68a5..4d0b0335d4a19344443dde58d4d8728a7b330031 100644 (file)
--- a/src/kadmin.v4/server/kadm_funcs.c
+++ b/src/kadmin.v4/server/kadm_funcs.c
@@ -78,9 +78,9 @@ kadm_entry2princ(entry, princ)
   krb5_xfree(mprinc);
 
   /* Find the V4 key */
-  retval = krb5_dbe_find_keytype(kadm_context,
+  retval = krb5_dbe_find_enctype(kadm_context,
                                 &entry,
-                                KEYTYPE_DES_CBC_MD5,
+                                ENCTYPE_DES_CBC_MD5,
                                 KRB5_KDB_SALTTYPE_V4,
                                 -1,
                                 &pkey);
@@ -127,9 +127,9 @@ kadm_princ2entry(princ, entry)
   if (mprinc.mod_princ)
     krb5_free_principal(kadm_context, mprinc.mod_princ);
 
-  if (retval = krb5_dbe_find_keytype(kadm_context,
+  if (retval = krb5_dbe_find_enctype(kadm_context,
                                     entry,
-                                    KEYTYPE_DES_CBC_MD5,
+                                    ENCTYPE_DES_CBC_MD5,
                                     KRB5_KDB_SALTTYPE_V4,
                                     -1,
                                     &kdatap)) {
@@ -137,7 +137,7 @@ kadm_princ2entry(princ, entry)
       kdatap = &entry->key_data[entry->n_key_data-1];
   }
   if (kdatap) {
-    kdatap->key_data_type[0] = (krb5_int16) KEYTYPE_DES_CBC_MD5;
+    kdatap->key_data_type[0] = (krb5_int16) ENCTYPE_DES_CBC_MD5;
     kdatap->key_data_type[1] = (krb5_int16) KRB5_KDB_SALTTYPE_V4; 
     kdatap->key_data_kvno = (krb5_int16) princ.key_version;
   }
@@ -242,9 +242,9 @@ Kadm_vals *valsout;
   if ((newpw.contents = (krb5_octet *)malloc(8)) == NULL)
     failadd(KADM_NOMEM);
 
-  if (retval = krb5_dbe_find_keytype(kadm_context,
+  if (retval = krb5_dbe_find_enctype(kadm_context,
                                     &newentry,
-                                    KEYTYPE_DES_CBC_MD5,
+                                    ENCTYPE_DES_CBC_MD5,
                                     KRB5_KDB_SALTTYPE_V4,
                                     -1,
                                     &pkey)) {
@@ -259,7 +259,7 @@ Kadm_vals *valsout;
   memcpy(newpw.contents, &data_i.key_low, 4);
   memcpy((char *)(((krb5_int32 *) newpw.contents) + 1), &data_i.key_high, 4);
   newpw.length = 8;
-  newpw.keytype = KEYTYPE_DES_CBC_MD5;
+  newpw.enctype = ENCTYPE_DES_CBC_MD5;
   sblock.type = KRB5_KDB_SALTTYPE_V4;
   sblock.data.length = 0;
   sblock.data.data = (char *) NULL;
@@ -545,14 +545,14 @@ Kadm_vals *valsout;               /* the actual record which is returned */
       }
       newpw.magic = KV5M_KEYBLOCK;
       newpw.length = 8;
-      newpw.keytype = KEYTYPE_DES_CBC_MD5;
+      newpw.enctype = ENCTYPE_DES_CBC_MD5;
       temp_key.key_low = ntohl(temp_key.key_low);
       temp_key.key_high = ntohl(temp_key.key_high);
       memcpy(newpw.contents, &temp_key.key_low, 4);
       memcpy(newpw.contents + 4, &temp_key.key_high, 4);
-      if (retval = krb5_dbe_find_keytype(kadm_context,
+      if (retval = krb5_dbe_find_enctype(kadm_context,
                                         &newentry,
-                                        KEYTYPE_DES_CBC_MD5,
+                                        ENCTYPE_DES_CBC_MD5,
                                         KRB5_KDB_SALTTYPE_V4,
                                         -1,
                                         &pkey)) {
@@ -675,7 +675,7 @@ des_cblock newpw;
     failchange(KADM_NOMEM);
   memcpy(localpw.contents, newpw, 8);
   localpw.magic = KV5M_KEYBLOCK;
-  localpw.keytype = KEYTYPE_DES_CBC_MD5;
+  localpw.enctype = ENCTYPE_DES_CBC_MD5;
   localpw.length = 8;
   numfound = 1;
   retval = krb5_db_get_principal(kadm_context, rprinc, &odata,
@@ -686,9 +686,9 @@ des_cblock newpw;
     free(localpw.contents);
     failchange(retval);
   } else if (numfound == 1) {
-    if (retval = krb5_dbe_find_keytype(kadm_context,
+    if (retval = krb5_dbe_find_enctype(kadm_context,
                                       &odata,
-                                      KEYTYPE_DES_CBC_MD5,
+                                      ENCTYPE_DES_CBC_MD5,
                                       KRB5_KDB_SALTTYPE_V4,
                                       -1,
                                       &pkey)) {
@@ -968,9 +968,9 @@ kadm_chg_srvtab(rname, rinstance, rrealm, values)
     krb5_free_principal(kadm_context, inprinc);
     failsrvtab(retval);
   } else if (numfound) {
-    retval = krb5_dbe_find_keytype(kadm_context,
+    retval = krb5_dbe_find_enctype(kadm_context,
                                   &odata,
-                                  KEYTYPE_DES_CBC_MD5,
+                                  ENCTYPE_DES_CBC_MD5,
                                   KRB5_KDB_SALTTYPE_V4,
                                   -1,
                                   &pkey);
@@ -995,7 +995,7 @@ kadm_chg_srvtab(rname, rinstance, rrealm, values)
       pkey = &odata.key_data[0];
       memset(pkey, 0, sizeof(*pkey));
       pkey->key_data_ver = 2;
-      pkey->key_data_type[0] = KEYTYPE_DES_CBC_MD5;
+      pkey->key_data_type[0] = ENCTYPE_DES_CBC_MD5;
       pkey->key_data_type[1] = KRB5_KDB_SALTTYPE_V4;
     }
   }
@@ -1015,7 +1015,7 @@ kadm_chg_srvtab(rname, rinstance, rrealm, values)
     krb5_db_free_principal(kadm_context, &odata, 1);
     failsrvtab(KADM_NOMEM);
   }
-  newpw.keytype = KEYTYPE_DES_CBC_MD5;
+  newpw.enctype = ENCTYPE_DES_CBC_MD5;
   newpw.length = 8;
   memcpy((char *)newpw.contents, new_key, 8);
   memset((char *)new_key, 0, sizeof (new_key));

diff --git a/src/kadmin.v4/server/kadm_ser_wrap.c b/src/kadmin.v4/server/kadm_ser_wrap.c
index abe4214d513939489155dad2a7dd3254622af610..5d80bb1fe61a2831e45f38459884c5a4e55ea0c0 100644 (file)
--- a/src/kadmin.v4/server/kadm_ser_wrap.c
+++ b/src/kadmin.v4/server/kadm_ser_wrap.c
@@ -76,10 +76,10 @@ kadm_ser_init(inter, realm)
     server_parm.admin_addr.sin_port = sep->s_port;
     /* setting up the database */
     mkey_name = KRB5_KDB_M_NAME;
-    server_parm.master_keyblock.keytype = KEYTYPE_DES_CBC_MD5;
+    server_parm.master_keyblock.enctype = ENCTYPE_DES_CBC_MD5;
     
-    krb5_use_keytype(kadm_context, &server_parm.master_encblock, 
-                   server_parm.master_keyblock.keytype);
+    krb5_use_enctype(kadm_context, &server_parm.master_encblock, 
+                   server_parm.master_keyblock.enctype);
     
     retval = krb5_db_setup_mkey_name(kadm_context, mkey_name, realm,
                                     (char **) 0,
@@ -106,9 +106,9 @@ kadm_ser_init(inter, realm)
     if (retval || more || !numfound)
        return KADM_NO_VERI;
 
-    retval = krb5_dbe_find_keytype(kadm_context,
+    retval = krb5_dbe_find_enctype(kadm_context,
                                   &master_entry,
-                                  KEYTYPE_DES_CBC_MD5,
+                                  ENCTYPE_DES_CBC_MD5,
                                   -1,
                                   -1,
                                   &kdatap);