From a74a7620b56aee187bf5d70b147e66aee4598f09 Mon Sep 17 00:00:00 2001 From: Chris Provenzano Date: Wed, 6 Sep 1995 19:11:25 +0000 Subject: [PATCH] * 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 --- src/lib/krb425/ChangeLog | 5 +++++ src/lib/krb425/get_cred.c | 2 +- src/lib/krb425/mk_priv.c | 4 ++-- src/lib/krb425/mk_safe.c | 2 +- src/lib/krb425/rd_priv.c | 2 +- src/lib/krb425/rd_req.c | 2 +- src/lib/krb425/rd_safe.c | 2 +- src/lib/krb425/set_key.c | 4 ++-- 8 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/lib/krb425/ChangeLog b/src/lib/krb425/ChangeLog index a5692ed65..57b275d75 100644 --- 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 * 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 bdac3aeb3..3af2241c0 100644 --- 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 c53a1f91b..d54b7a155 100644 --- 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 399a3c1eb..92c660d4c 100644 --- 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 dadb5a47d..00af19687 100644 --- 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 c339233c7..a32a659c5 100644 --- 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 ec5a96f36..3c8fa3787 100644 --- 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 d38c18d81..3b4ef1d36 100644 --- 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); -- 2.26.2