d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename des_set_key -> des_set_key_krb. This was a name conflict with a

Browse Source 
documented routine in libdes.
This commit is contained in:
Mark Murray 1996-02-03 11:40:16 +00:00
parent 1d6b2fd781
commit 9e084cdbbc
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eBones/include/krb.h
View File

@ -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));

7
eBones/lib/libkrb/des_rw.c
View File

@ -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));

2
eBones/libexec/registerd/registerd.c
View File

@ -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 */

2
eBones/usr.bin/register/register.c
View File

@ -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;
}