diff options
| author | Mark Murray <markm@FreeBSD.org> | 1996-02-03 11:40:16 +0000 |
|---|---|---|
| committer | Mark Murray <markm@FreeBSD.org> | 1996-02-03 11:40:16 +0000 |
| commit | 9e084cdbbc8bb47bfa107a7509072472ff56dcec (patch) | |
| tree | 165949f30a71bdd02ce1e5e3dc8650ecf01c333d | |
| parent | 1d6b2fd781ce8399934045e0f1f15150c7ee5c45 (diff) | |
| download | src-9e084cdbbc8bb47bfa107a7509072472ff56dcec.tar.gz src-9e084cdbbc8bb47bfa107a7509072472ff56dcec.zip | |
Rename des_set_key -> des_set_key_krb. This was a name conflict with a
documented routine in libdes.
Notes
Notes:
svn path=/head/; revision=13878
| -rw-r--r-- | eBones/include/krb.h | 4 | ||||
| -rw-r--r-- | eBones/lib/libkrb/des_rw.c | 7 | ||||
| -rw-r--r-- | eBones/libexec/registerd/registerd.c | 2 | ||||
| -rw-r--r-- | eBones/usr.bin/register/register.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/eBones/include/krb.h b/eBones/include/krb.h index d7b77f7ab856..a9eba82b6f1b 100644 --- a/eBones/include/krb.h +++ b/eBones/include/krb.h @@ -6,7 +6,7 @@ * Include file for the Kerberos library. * * from: krb.h,v 4.26 89/08/08 17:55:25 jtkohl Exp $ - * $Id: krb.h,v 1.6 1995/09/13 17:23:47 markm Exp $ + * $Id: krb.h,v 1.7 1995/10/05 21:29:26 gibbs Exp $ */ /* Only one time, please */ @@ -447,6 +447,8 @@ int tf_get_cred __P((CREDENTIALS *c)); void tf_close __P((void)); /* Internal routines */ +int des_set_key_krb __P((des_cblock *inkey, des_key_schedule insched)); +void des_clear_key_krb __P((void)); int des_read __P((int fd, char *buf, int len)); int des_write __P((int fd, char *buf, int len)); int krb_get_tf_realm __P((char *ticket_file, char *realm)); diff --git a/eBones/lib/libkrb/des_rw.c b/eBones/lib/libkrb/des_rw.c index 5b339ee3238e..e7e867a20c78 100644 --- a/eBones/lib/libkrb/des_rw.c +++ b/eBones/lib/libkrb/des_rw.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: des_rw.c,v 1.6 1995/07/18 16:38:17 mark Exp $ + * $Id: des_rw.c,v 1.4 1995/09/07 21:37:50 markm Exp $ */ /* @@ -122,7 +122,7 @@ static u_char *buff_ptr = buffer; */ int -des_set_key(inkey, insched) +des_set_key_krb(inkey, insched) des_cblock *inkey; des_key_schedule insched; { @@ -135,7 +135,8 @@ des_set_key(inkey, insched) * Clear the key schedule, and initial vector, which were previously * stored in static vars by des_set_key(). */ -void des_clear_key() +void +des_clear_key_krb() { bzero(&des_key, sizeof(des_cblock)); bzero(&key_schedule, sizeof(des_key_schedule)); diff --git a/eBones/libexec/registerd/registerd.c b/eBones/libexec/registerd/registerd.c index 36c7a742ac46..7c749240ae1b 100644 --- a/eBones/libexec/registerd/registerd.c +++ b/eBones/libexec/registerd/registerd.c @@ -134,7 +134,7 @@ main(argc, argv) send_packet(msgbuf, CLEAR); kfile = (struct keyfile_data *) keybuf; key_sched((C_Block *)kfile->kf_key, schedule); - des_set_key((des_cblock *)kfile->kf_key, schedule); + des_set_key_krb((des_cblock *)kfile->kf_key, schedule); /* read the command code byte */ diff --git a/eBones/usr.bin/register/register.c b/eBones/usr.bin/register/register.c index 7050cca1284b..d38dcc456b08 100644 --- a/eBones/usr.bin/register/register.c +++ b/eBones/usr.bin/register/register.c @@ -290,7 +290,7 @@ setup_key(local) exit(1); } key_sched((des_cblock *)kdata.kf_key, schedule); - des_set_key((des_cblock *)kdata.kf_key, schedule); + des_set_key_krb((des_cblock *)kdata.kf_key, schedule); return; } |