* get_cred.c, mk_priv.c, mk_safe.c, rd_priv.c, rd_req.c, rd_safe.c,

	* set_key.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g

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

diff --git a/src/lib/krb425/ChangeLog b/src/lib/krb425/ChangeLog
index a5692ed6568e0903e38013e7d9ab967cd9f5ab30..57b275d7578c73ed5c1f75a92cfbe8b5b27cab7c 100644 (file)
--- a/src/lib/krb425/ChangeLog
+++ b/src/lib/krb425/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * get_cred.c, mk_priv.c, mk_safe.c, rd_priv.c, rd_req.c, rd_safe.c,
+       * set_key.c : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
 Thu Jul 13 19:47:47 1995  Sam Hartman  <hartmans@tertius.mit.edu>
 
        * rd_priv.c rd_safe.c: Include netinet/in.h

diff --git a/src/lib/krb425/get_cred.c b/src/lib/krb425/get_cred.c
index bdac3aeb340112f5d87918a9eedfc50fd4248217..3af2241c09065f0f09bba316ef9ba5c49835c137 100644 (file)
--- a/src/lib/krb425/get_cred.c
+++ b/src/lib/krb425/get_cred.c
@@ -56,7 +56,7 @@ CREDENTIALS *c;
 
        creds.client = client_principal;
        creds.times.endtime = 0;
-       creds.keyblock.keytype = KEYTYPE_DES;
+       creds.keyblock.enctype = ENCTYPE_DES;
 
        r = krb5_get_credentials(0, _krb425_ccache, &creds);
        if (r)

diff --git a/src/lib/krb425/mk_priv.c b/src/lib/krb425/mk_priv.c
index c53a1f91baffabb3403d5503802c4be06a8dfc09..d54b7a1552263ec16ac4a1789a616340103d585f 100644 (file)
--- a/src/lib/krb425/mk_priv.c
+++ b/src/lib/krb425/mk_priv.c
@@ -49,7 +49,7 @@ struct sockaddr_in *receiver;
        char sa[4], ra[4];
        krb5_rcache rcache;
 
-       keyb.keytype = KEYTYPE_DES;
+       keyb.enctype = ENCTYPE_DES;
        keyb.length = sizeof(des_cblock);
        keyb.contents = (krb5_octet *)key;
 
@@ -87,7 +87,7 @@ struct sockaddr_in *receiver;
            return(-1);
        }
        r = krb5_mk_priv(&inbuf,
-                        KEYTYPE_DES,
+                        ENCTYPE_DES,
                         &keyb,
                         saddr2, &raddr,
                         0,             /* no sequence number */

diff --git a/src/lib/krb425/mk_safe.c b/src/lib/krb425/mk_safe.c
index 399a3c1eb6d5dbf752b4c87ba56f2b2eb67d0add..92c660d4ca4167441f6bc41da3ee8bbf744f553e 100644 (file)
--- a/src/lib/krb425/mk_safe.c
+++ b/src/lib/krb425/mk_safe.c
@@ -48,7 +48,7 @@ struct sockaddr_in *receiver;
        char sa[4], ra[4];
        krb5_rcache rcache;
 
-       keyb.keytype = KEYTYPE_DES;
+       keyb.enctype = ENCTYPE_DES;
        keyb.length = sizeof(des_cblock);
        keyb.contents = (krb5_octet *)key;
 

diff --git a/src/lib/krb425/rd_priv.c b/src/lib/krb425/rd_priv.c
index dadb5a47db80686529dfba1bb5b2eb8293d17a8f..00af19687d1007b7ec70dc496f90e8468ea3a1fc 100644 (file)
--- a/src/lib/krb425/rd_priv.c
+++ b/src/lib/krb425/rd_priv.c
@@ -50,7 +50,7 @@ MSG_DAT *msg;
        krb5_rcache rcache;
        char *cachename;
 
-       keyb.keytype = KEYTYPE_DES;
+       keyb.enctype = ENCTYPE_DES;
        keyb.length = sizeof(des_cblock);
        keyb.contents = (krb5_octet *)key;
 

diff --git a/src/lib/krb425/rd_req.c b/src/lib/krb425/rd_req.c
index c339233c77838a387bf21ebda780a83750673303..a32a659c5cd19d4d89faa00a105a974688d37c68 100644 (file)
--- a/src/lib/krb425/rd_req.c
+++ b/src/lib/krb425/rd_req.c
@@ -195,7 +195,7 @@ char *fn;
   
        ad->checksum = *(long *)authdat->authenticator->checksum->contents;
 
-       if (authdat->ticket->enc_part2->session->keytype != KEYTYPE_DES) {
+       if (authdat->ticket->enc_part2->session->enctype != ENCTYPE_DES) {
                r = KFAILURE;
                goto out;
        } else

diff --git a/src/lib/krb425/rd_safe.c b/src/lib/krb425/rd_safe.c
index ec5a96f3607d3243875d2d5d5347e4bc9b02715f..3c8fa378736749c0e99b0aa5bc91a16dbcbb3606 100644 (file)
--- a/src/lib/krb425/rd_safe.c
+++ b/src/lib/krb425/rd_safe.c
@@ -50,7 +50,7 @@ MSG_DAT *msg;
        krb5_rcache rcache;
        char *cachename;
 
-       keyb.keytype = KEYTYPE_DES;
+       keyb.enctype = ENCTYPE_DES;
        keyb.length = sizeof(des_cblock);
        keyb.contents = (krb5_octet *)key;
 

diff --git a/src/lib/krb425/set_key.c b/src/lib/krb425/set_key.c
index d38c18d81741e953e47495f8cf9bf87fe357c746..3b4ef1d36d757ff7a434284836cacae661e01bf2 100644 (file)
--- a/src/lib/krb425/set_key.c
+++ b/src/lib/krb425/set_key.c
@@ -35,14 +35,14 @@ int cvt;
        if (cvt) {
                if (_krb425_servkey.contents)
                        krb5_xfree(_krb425_servkey.contents);
-               mit_des_string_to_key(KEYTYPE_DES, &_krb425_servkey, 0, 0);
+               mit_des_string_to_key(ENCTYPE_DES, &_krb425_servkey, 0, 0);
        } else {
                if (!_krb425_servkey.contents &&
                    !(_krb425_servkey.contents = (krb5_octet *)malloc(8))) {
                        return(KFAILURE);
                }
                _krb425_servkey.length = 8;
-               _krb425_servkey.keytype = KEYTYPE_DES;
+               _krb425_servkey.enctype = ENCTYPE_DES;
                memcpy((char *)_krb425_servkey.contents, (char *)key, 8);
        }
        return(KSUCCESS);