From 459fbde88db222f22c33366cd864ff6a9b1b57b7 Mon Sep 17 00:00:00 2001 From: Mark Eichin Date: Wed, 15 Jun 1994 21:01:56 +0000 Subject: [PATCH] step 1: bzero->memset(,0,) git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3809 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/bsd/krlogind.c | 2 +- src/appl/bsd/krshd.c | 2 +- src/appl/bsd/login.c | 14 ++++----- src/appl/bsd/logutil.c | 2 +- src/appl/popper/pop_enter.c | 2 +- src/appl/popper/pop_init.c | 2 +- src/appl/telnet/libtelnet/enc_des.c | 4 +-- src/appl/telnet/libtelnet/kerberos.c | 2 +- src/appl/telnet/libtelnet/kerberos5.c | 4 +-- src/appl/telnet/libtelnet/krb4encpwd.c | 2 +- src/appl/telnet/libtelnet/mem.c | 2 +- src/appl/telnet/libtelnet/read_password.c | 4 +-- src/appl/telnet/libtelnet/rsaencpwd.c | 4 +-- src/appl/telnet/telnet/commands.c | 2 +- src/appl/telnet/telnetd/sys_term.c | 4 +-- src/appl/telnet/telnetd/telnetd-ktd.c | 2 +- src/appl/telnet/telnetd/telnetd.c | 2 +- src/appl/telnet/telnetd/termstat.c | 2 +- src/isode/compat/asprintf.c | 5 ++- src/isode/compat/bridge.c | 7 +++-- src/isode/compat/camtec.c | 5 ++- src/isode/compat/dgram.c | 7 +++-- src/isode/compat/hpuxx25.c | 13 +++++--- src/isode/compat/internet.c | 5 ++- src/isode/compat/isoaddrs.c | 7 +++-- src/isode/compat/isoservent.c | 5 ++- src/isode/compat/na2norm.c | 5 ++- src/isode/compat/pa2str.c | 7 +++-- src/isode/compat/saddr2str.c | 5 ++- src/isode/compat/sstr2arg.c | 5 ++- src/isode/compat/str2sel.c | 5 ++- src/isode/compat/sunlink.c | 9 ++++-- src/isode/compat/taddr2str.c | 5 ++- src/isode/compat/x25addr.c | 21 +++++++------ src/isode/pepsy/etabs.c | 9 ++++-- src/isode/psap/addr2ref.c | 5 ++- src/isode/psap/bit_ops.c | 7 +++-- src/isode/psap/int2strb.c | 5 ++- src/isode/psap/pe_alloc.c | 5 ++- src/isode/psap/prim2oid.c | 5 ++- src/isode/psap/prim2time.c | 7 +++-- src/isode/psap/tm2ut.c | 5 ++- src/isode/psap/ut2tm.c | 5 ++- src/kdc/kerberos_v4.c | 37 +++++++++++------------ src/krb524/conv_creds.c | 2 +- src/krb524/getcred.c | 2 +- src/krb524/k524init.c | 2 +- src/krb524/krb524d.c | 2 +- src/krb524/test.c | 4 +-- src/lib/des425/random_key.c | 2 +- src/lib/des425/read_passwd.c | 2 +- src/lib/des425/str_to_key.c | 4 +-- src/lib/krb5/asn.1/adr2kadr.c | 2 +- src/lib/krb5/asn.1/aprp2kaprp.c | 2 +- src/lib/krb5/asn.1/aprq2kaprq.c | 2 +- src/lib/krb5/asn.1/arep2karep.c | 2 +- src/lib/krb5/asn.1/asn1glue.h | 1 - src/lib/krb5/asn.1/auth2kauth.c | 2 +- src/lib/krb5/asn.1/cred2kcred.c | 4 +-- src/lib/krb5/asn.1/crep2kcrep.c | 4 +-- src/lib/krb5/asn.1/edat2kedat.c | 2 +- src/lib/krb5/asn.1/ekrp2kekrp.c | 2 +- src/lib/krb5/asn.1/err2kerr.c | 2 +- src/lib/krb5/asn.1/etpt2ketpt.c | 2 +- src/lib/krb5/asn.1/kadat2adat.c | 4 +-- src/lib/krb5/asn.1/kaddr2addr.c | 4 +-- src/lib/krb5/asn.1/kadr2adr.c | 2 +- src/lib/krb5/asn.1/kaprp2aprp.c | 2 +- src/lib/krb5/asn.1/kaprq2aprq.c | 2 +- src/lib/krb5/asn.1/karep2arep.c | 2 +- src/lib/krb5/asn.1/kauth2auth.c | 2 +- src/lib/krb5/asn.1/kcred2cred.c | 4 +-- src/lib/krb5/asn.1/kcrep2crep.c | 6 ++-- src/lib/krb5/asn.1/kdcr2kkdcr.c | 2 +- src/lib/krb5/asn.1/kedat2edat.c | 2 +- src/lib/krb5/asn.1/kekrp2ekrp.c | 2 +- src/lib/krb5/asn.1/kerr2err.c | 2 +- src/lib/krb5/asn.1/ketpt2etpt.c | 2 +- src/lib/krb5/asn.1/kkdcr2kdcr.c | 4 +-- src/lib/krb5/asn.1/klsrq2lsrq.c | 4 +-- src/lib/krb5/asn.1/kprep2prep.c | 2 +- src/lib/krb5/asn.1/kprin2prin.c | 2 +- src/lib/krb5/asn.1/kpriv2priv.c | 2 +- src/lib/krb5/asn.1/ksafe2safe.c | 4 +-- src/lib/krb5/asn.1/ktgrq2tgrq.c | 14 ++++----- src/lib/krb5/asn.1/ktkt2tkt.c | 2 +- src/lib/krb5/asn.1/ktran2tran.c | 2 +- src/lib/krb5/asn.1/prep2kprep.c | 2 +- src/lib/krb5/asn.1/priv2kpriv.c | 2 +- src/lib/krb5/asn.1/safe2ksafe.c | 2 +- src/lib/krb5/asn.1/tgrq2ktgrq.c | 2 +- src/lib/krb5/asn.1/tkt2ktkt.c | 2 +- src/lib/krb5/asn.1/tran2ktran.c | 2 +- src/lib/krb5/ccache/stdio/scc_maybe.c | 2 +- 94 files changed, 235 insertions(+), 164 deletions(-) diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c index 9b039eb70..fb5c93b0c 100644 --- a/src/appl/bsd/krlogind.c +++ b/src/appl/bsd/krlogind.c @@ -395,7 +395,7 @@ main(argc, argv) exit(2); } - bzero((char *) &sin,sizeof(sin)); + memset((char *) &sin, 0,sizeof(sin)); sin.sin_family = AF_INET; sin.sin_port = htons(debug_port); sin.sin_addr.s_addr = INADDR_ANY; diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c index c98c92129..e5e4eabf4 100644 --- a/src/appl/bsd/krshd.c +++ b/src/appl/bsd/krshd.c @@ -280,7 +280,7 @@ main(argc, argv) exit(2); } - bzero((char *) &sin,sizeof(sin)); + memset((char *) &sin, 0,sizeof(sin)); sin.sin_family = AF_INET; sin.sin_port = htons(debug_port); sin.sin_addr.s_addr = INADDR_ANY; diff --git a/src/appl/bsd/login.c b/src/appl/bsd/login.c index 4b58b72c8..aeec53d74 100644 --- a/src/appl/bsd/login.c +++ b/src/appl/bsd/login.c @@ -515,7 +515,7 @@ main(argc, argv) (void) strncpy(pp, pp2, sizeof(pp)); pp[8]='\0'; namep = crypt(pp, pwd->pw_passwd); - bzero (pp, sizeof(pp)); /* To the best of my recollection, Senator... */ + memset (pp, 0, sizeof(pp)); /* To the best of my recollection, Senator... */ lpass_ok = !strcmp (namep, pwd->pw_passwd); if (pwd->pw_uid != 0) { /* Don't get tickets for root */ @@ -553,7 +553,7 @@ main(argc, argv) realm, "krbtgt", realm, DEFAULT_TKT_LIFE, pp2); - bzero (pp2, sizeof(pp2)); + memset (pp2, 0, sizeof(pp2)); (void) setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); switch (krbval) { case INTK_OK: @@ -582,7 +582,7 @@ main(argc, argv) break; } } else { - (void) bzero (pp2, sizeof(pp2)); + (void) memset (pp2, 0, sizeof(pp2)); (void) setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET); } @@ -673,14 +673,14 @@ bad_login: { struct utmp utmp; - bzero((char *)&utmp, sizeof(utmp)); + memset((char *)&utmp, 0, sizeof(utmp)); login_time = time(&utmp.ut_time); (void) strncpy(utmp.ut_name, username, sizeof(utmp.ut_name)); if (hostname) (void) strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host)); else - bzero(utmp.ut_host, sizeof(utmp.ut_host)); + memset(utmp.ut_host, 0, sizeof(utmp.ut_host)); (void) strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line)); login(&utmp); } @@ -971,7 +971,7 @@ dolastlog(quiet, tty) if (hostname) (void) strncpy(ll.ll_host, hostname, sizeof(ll.ll_host)); else - (void) bzero(ll.ll_host, sizeof(ll.ll_host)); + (void) memset(ll.ll_host, 0, sizeof(ll.ll_host)); (void)write(fd, (char *)&ll, sizeof(ll)); (void)close(fd); } @@ -1026,7 +1026,7 @@ do_krb_login(host, strict) * Kerberos autologin protocol. */ - (void) bzero((char *) &sin, (int) sizeof(sin)); + (void) memset((char *) &sin, 0, (int) sizeof(sin)); if (hp) (void) bcopy (hp->h_addr, (char *)&sin.sin_addr, diff --git a/src/appl/bsd/logutil.c b/src/appl/bsd/logutil.c index 861fa89d8..132ec1857 100644 --- a/src/appl/bsd/logutil.c +++ b/src/appl/bsd/logutil.c @@ -53,7 +53,7 @@ void login(ut) (void) strncpy(ut->ut_id, ut->ut_line, sizeof(ut->ut_id)); (void) setutent(); - (void) bzero((char *)&utmp, sizeof(utmp)); + (void) memset((char *)&utmp, 0, sizeof(utmp)); (void) strncpy(utmp.ut_id, ut->ut_id, sizeof(utmp.ut_id)); utmp.ut_type = DEAD_PROCESS; (void) getutid(&utmp); diff --git a/src/appl/popper/pop_enter.c b/src/appl/popper/pop_enter.c index 1206f6b40..11e5b5f00 100644 --- a/src/appl/popper/pop_enter.c +++ b/src/appl/popper/pop_enter.c @@ -150,7 +150,7 @@ notify_recipient(name) if ((ret = ZInitialize()) == ZERR_NONE) init = 0; - bzero(¬ice, sizeof(notice)); + memset(¬ice, 0, sizeof(notice)); notice.z_kind = UNSAFE; notice.z_class = "message"; notice.z_class_inst = "pop"; diff --git a/src/appl/popper/pop_init.c b/src/appl/popper/pop_init.c index daa852fac..efa98ba55 100644 --- a/src/appl/popper/pop_init.c +++ b/src/appl/popper/pop_init.c @@ -65,7 +65,7 @@ char ** argmessage; char * trace_file_name; /* Initialize the POP parameter block */ - bzero ((char *)p,(int)sizeof(POP)); + memset ((char *)p, 0,(int)sizeof(POP)); /* Save my name in a global variable */ p->myname = argmessage[0]; diff --git a/src/appl/telnet/libtelnet/enc_des.c b/src/appl/telnet/libtelnet/enc_des.c index 8e7b44dd3..d3de50578 100644 --- a/src/appl/telnet/libtelnet/enc_des.c +++ b/src/appl/telnet/libtelnet/enc_des.c @@ -143,7 +143,7 @@ ofb64_init(server) fb64_init(fbp) register struct fb *fbp; { - bzero((void *)fbp, sizeof(*fbp)); + memset((void *)fbp, 0, sizeof(*fbp)); fbp->state[0] = fbp->state[1] = FAILED; fbp->fb_feed[0] = IAC; fbp->fb_feed[1] = SB; @@ -374,7 +374,7 @@ fb64_reply(data, cnt, fbp) break; case FB64_IV_BAD: - bzero(fbp->temp_feed, sizeof(Block)); + memset(fbp->temp_feed, 0, sizeof(Block)); fb64_stream_iv(fbp->temp_feed, &fbp->streams[DIR_ENCRYPT-1]); state = FAILED; break; diff --git a/src/appl/telnet/libtelnet/kerberos.c b/src/appl/telnet/libtelnet/kerberos.c index 57a58b41f..267337865 100644 --- a/src/appl/telnet/libtelnet/kerberos.c +++ b/src/appl/telnet/libtelnet/kerberos.c @@ -185,7 +185,7 @@ kerberos4_send(ap) return(0); } - bzero(instance, sizeof(instance)); + memset(instance, 0, sizeof(instance)); if (realm = krb_get_phost(RemoteHostName)) strncpy(instance, realm, sizeof(instance)); diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c index 19f675ccc..0bc45cc70 100644 --- a/src/appl/telnet/libtelnet/kerberos5.c +++ b/src/appl/telnet/libtelnet/kerberos5.c @@ -204,7 +204,7 @@ kerberos5_send(ap) ksum.checksum_type = CKSUMTYPE_CRC32; ksum.contents = sum; ksum.length = sizeof(sum); - bzero((Voidptr )sum, sizeof(sum)); + memset((Voidptr )sum, 0, sizeof(sum)); if (!UserNameRequested) { if (auth_debug_mode) { @@ -220,7 +220,7 @@ kerberos5_send(ap) return(0); } - bzero((char *)&creds, sizeof(creds)); + memset((char *)&creds, 0, sizeof(creds)); if (r = krb5_sname_to_principal(RemoteHostName,"host",KRB5_NT_SRV_HST, &creds.server)) { if (auth_debug_mode) diff --git a/src/appl/telnet/libtelnet/krb4encpwd.c b/src/appl/telnet/libtelnet/krb4encpwd.c index 93cbe9535..dbf25de77 100644 --- a/src/appl/telnet/libtelnet/krb4encpwd.c +++ b/src/appl/telnet/libtelnet/krb4encpwd.c @@ -311,7 +311,7 @@ krb4encpwd_reply(ap, data, cnt) gethostname(hostname, sizeof(hostname)); realm = krb_realmofhost(hostname); bcopy((void *)data, (void *)challenge, cnt); - bzero(user_passwd, sizeof(user_passwd)); + memset(user_passwd, 0, sizeof(user_passwd)); local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0); UserPassword = user_passwd; Challenge = challenge; diff --git a/src/appl/telnet/libtelnet/mem.c b/src/appl/telnet/libtelnet/mem.c index 798b4823c..33503f14e 100644 --- a/src/appl/telnet/libtelnet/mem.c +++ b/src/appl/telnet/libtelnet/mem.c @@ -109,7 +109,7 @@ memmove(dst, src, length) #define WIDEVAL 0 void -bzero(dst0, length) +memset(dst0, 0, length) void *dst0; register size_t length; #else diff --git a/src/appl/telnet/libtelnet/read_password.c b/src/appl/telnet/libtelnet/read_password.c index 4179ffca2..cebaaadcd 100644 --- a/src/appl/telnet/libtelnet/read_password.c +++ b/src/appl/telnet/libtelnet/read_password.c @@ -127,7 +127,7 @@ local_des_read_pw_string(s,max,prompt,verify) lose: if (!ok) - bzero(s, max); + memset(s, 0, max); printf("\n"); /* turn echo back on */ tty_state.sg_flags |= ECHO; @@ -138,7 +138,7 @@ lose: */ bcopy((char *)env, (char *)old_env, sizeof(env)); if (verify) - bzero(key_string, sizeof (key_string)); + memset(key_string, 0, sizeof (key_string)); s[max-1] = 0; /* force termination */ return !ok; /* return nonzero if not okay */ } diff --git a/src/appl/telnet/libtelnet/rsaencpwd.c b/src/appl/telnet/libtelnet/rsaencpwd.c index b82cc888b..4ec81206e 100644 --- a/src/appl/telnet/libtelnet/rsaencpwd.c +++ b/src/appl/telnet/libtelnet/rsaencpwd.c @@ -158,7 +158,7 @@ rsaencpwd_init(ap, server) if (server) { str_data[3] = TELQUAL_REPLY; - bzero(key_file, sizeof(key_file)); + memset(key_file, 0, sizeof(key_file)); gethostname(lhostname, sizeof(lhostname)); if ((cp = index(lhostname, '.')) != 0) *cp = '\0'; strcpy(key_file, "/etc/."); @@ -363,7 +363,7 @@ rsaencpwd_reply(ap, data, cnt) pubkey_len = DecodeValueLength(ptr); ptr += NumEncodeLengthOctets(pubkey_len); bcopy(ptr, pubkey, pubkey_len); - bzero(user_passwd, sizeof(user_passwd)); + memset(user_passwd, 0, sizeof(user_passwd)); local_des_read_pw_string(user_passwd, sizeof(user_passwd)-1, "Password: ", 0); UserPassword = user_passwd; Challenge = challenge; diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c index ec9bd0554..da7b459e9 100644 --- a/src/appl/telnet/telnet/commands.c +++ b/src/appl/telnet/telnet/commands.c @@ -2228,7 +2228,7 @@ tn(argc, argv) char *cmd, *hostp = 0, *portp = 0, *user = 0; /* clear the socket address prior to use */ - bzero((char *)&sin, sizeof(sin)); + memset((char *)&sin, 0, sizeof(sin)); if (connected) { printf("?Already connected to %s\n", hostname); diff --git a/src/appl/telnet/telnetd/sys_term.c b/src/appl/telnet/telnetd/sys_term.c index e4f2bbf49..5e727aff8 100644 --- a/src/appl/telnet/telnetd/sys_term.c +++ b/src/appl/telnet/telnetd/sys_term.c @@ -1100,7 +1100,7 @@ getptyslave() init_termbuf(); # ifdef TIOCGWINSZ if (def_row || def_col) { - bzero((char *)&ws, sizeof(ws)); + memset((char *)&ws, 0, sizeof(ws)); ws.ws_col = def_col; ws.ws_row = def_row; (void)ioctl(t, TIOCSWINSZ, (char *)&ws); @@ -1521,7 +1521,7 @@ start_login(host, autologin, name) * Create utmp entry for child */ - bzero(&utmpx, sizeof(utmpx)); + memset(&utmpx, 0, sizeof(utmpx)); SCPYN(utmpx.ut_user, ".telnet"); SCPYN(utmpx.ut_line, line + sizeof("/dev/") - 1); utmpx.ut_pid = pid; diff --git a/src/appl/telnet/telnetd/telnetd-ktd.c b/src/appl/telnet/telnetd/telnetd-ktd.c index 50b167498..f73a4d4f8 100644 --- a/src/appl/telnet/telnetd/telnetd-ktd.c +++ b/src/appl/telnet/telnetd/telnetd-ktd.c @@ -396,7 +396,7 @@ main(argc, argv) if (secflag) { int sz = sizeof(ss); - bzero((char *)&dv, sizeof(dv)); + memset((char *)&dv, 0, sizeof(dv)); if (getsysv(&sysv, sizeof(struct sysv)) != 0) { perror("getsysv"); diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c index c2944da73..d1c3c3176 100644 --- a/src/appl/telnet/telnetd/telnetd.c +++ b/src/appl/telnet/telnetd/telnetd.c @@ -451,7 +451,7 @@ main(argc, argv) int szi = sizeof(int); #endif /* SO_SEC_MULTI */ - bzero((char *)&dv, sizeof(dv)); + memset((char *)&dv, 0, sizeof(dv)); if (getsysv(&sysv, sizeof(struct sysv)) != 0) { perror("getsysv"); diff --git a/src/appl/telnet/telnetd/termstat.c b/src/appl/telnet/telnetd/termstat.c index a3f693122..d8b75ba4c 100644 --- a/src/appl/telnet/telnetd/termstat.c +++ b/src/appl/telnet/telnetd/termstat.c @@ -632,7 +632,7 @@ defer_terminit() if (def_col || def_row) { struct winsize ws; - bzero((char *)&ws, sizeof(ws)); + memset((char *)&ws, 0, sizeof(ws)); ws.ws_col = def_col; ws.ws_row = def_row; (void) ioctl(pty, TIOCSWINSZ, (char *)&ws); diff --git a/src/isode/compat/asprintf.c b/src/isode/compat/asprintf.c index d27152324..e31b0bfed 100644 --- a/src/isode/compat/asprintf.c +++ b/src/isode/compat/asprintf.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:08 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:26:54 eichin * autoconfed isode for kerberos work * @@ -80,7 +83,7 @@ va_list ap; #ifndef VSPRINTF #ifdef pyr - bzero ((char *) &iob, sizeof iob); + memset ((char *) &iob, 0, sizeof iob); iob._file = _NFILE; #endif iob._flag = _IOWRT | _IOSTRG; diff --git a/src/isode/compat/bridge.c b/src/isode/compat/bridge.c index 45fd18179..d6fb02338 100644 --- a/src/isode/compat/bridge.c +++ b/src/isode/compat/bridge.c @@ -11,6 +11,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:09 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:26:59 eichin * autoconfed isode for kerberos work * @@ -101,7 +104,7 @@ u_short port; return NOTOK; } - bzero ((char *) isock, sizeof *isock); + memset ((char *) isock, 0, sizeof *isock); isock -> sin_family = hp -> h_addrtype; isock -> sin_port = port; inaddr_copy (hp, isock); @@ -254,7 +257,7 @@ int backlog, return NOTOK; } - bzero ((char *) lsock, sizeof *lsock); + memset ((char *) lsock, 0, sizeof *lsock); lsock -> sin_family = hp -> h_addrtype; inaddr_copy (hp, lsock); diff --git a/src/isode/compat/camtec.c b/src/isode/compat/camtec.c index 20e251bec..107b6945c 100644 --- a/src/isode/compat/camtec.c +++ b/src/isode/compat/camtec.c @@ -11,6 +11,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:11 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:01 eichin * autoconfed isode for kerberos work * @@ -200,7 +203,7 @@ struct NSAPaddr *remote; (void) gen2if (remote, sck, ADDR_REMOTE); if ((r = connect (fd, sck, sizeof (CONN_DB))) >= 0) ioctl (fd, CCL_SEND_TYPE, 0); - bzero(calling_dte, sizeof calling_dte ); + memset(calling_dte, 0, sizeof calling_dte ); return (r); } diff --git a/src/isode/compat/dgram.c b/src/isode/compat/dgram.c index 7c15fb247..a4e02576b 100644 --- a/src/isode/compat/dgram.c +++ b/src/isode/compat/dgram.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:12 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:11 eichin * autoconfed isode for kerberos work * @@ -430,7 +433,7 @@ struct sockaddr *sock; } if (sock == NULL) { - bzero ((caddr_t) &up -> dgram_peer, sizeof up -> dgram_peer); + memset ((caddr_t) &up -> dgram_peer, 0, sizeof up -> dgram_peer); return OK; } @@ -493,7 +496,7 @@ int fd; action ("CLOSE", fd, &up -> dgram_peer.sa); up -> dgram_parent = NOTOK; - bzero ((char *) &up -> dgram_peer, sizeof up -> dgram_peer); + memset ((char *) &up -> dgram_peer, 0, sizeof up -> dgram_peer); QBFREE (&up -> dgram_queue); for (vp = (up = peers) + maxpeers; up < vp; up++) diff --git a/src/isode/compat/hpuxx25.c b/src/isode/compat/hpuxx25.c index 22ee713b8..5fe5050df 100644 --- a/src/isode/compat/hpuxx25.c +++ b/src/isode/compat/hpuxx25.c @@ -12,6 +12,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:14 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:18 eichin * autoconfed isode for kerberos work * @@ -110,7 +113,7 @@ int backlog, int sd, onoff, pgrp; char cudfbuf [NPSIZE + CUDFSIZE]; - bzero(&sbuf, sizeof(CONN_DB)); + memset(&sbuf, 0, sizeof(CONN_DB)); sbuf.addr.x25_family = AF_CCITT; if ((sd = socket (AF_CCITT, SOCK_STREAM, 0)) == NOTOK) { SLOG (compat_log, LLOG_EXCEPTIONS, "failed", ("socket")); @@ -199,7 +202,7 @@ register struct NSAPaddr *remote; CONN_DB *sock = &sbuf; register int nfd; - bzero(&sbuf, sizeof(CONN_DB)); + memset(&sbuf, 0, sizeof(CONN_DB)); sbuf.addr.x25_family = AF_CCITT; sock = gen2if (remote, sock, ADDR_REMOTE); @@ -238,7 +241,7 @@ struct NSAPaddr *remote; int len = sizeof *sock; int nfd; - bzero(&sbuf, sizeof(CONN_DB)); + memset(&sbuf, 0, sizeof(CONN_DB)); sbuf.addr.x25_family = AF_CCITT; if ((nfd = accept (fd, (X25_ADDR *) &sock->addr, &len)) == NOTOK) { return nfd; @@ -380,8 +383,8 @@ char *caption; FACILITY_DB facilities; CCITT_FACILITY_DB ccitt_facilities; - bzero ((char *) &facilities, sizeof (FACILITY_DB)); - bzero ((char *) &ccitt_facilities, sizeof (CCITT_FACILITY_DB)); + memset ((char *) &facilities, 0, sizeof (FACILITY_DB)); + memset ((char *) &ccitt_facilities, 0, sizeof (CCITT_FACILITY_DB)); if (ioctl (sd, X25_RD_FACILITIES, (char *) &ccitt_facilities) == NOTOK) { SLOG (x25_log, LLOG_EXCEPTIONS, "failed", ("X25_RD_FACILITIES")); diff --git a/src/isode/compat/internet.c b/src/isode/compat/internet.c index b6e0ea548..b4128ede1 100644 --- a/src/isode/compat/internet.c +++ b/src/isode/compat/internet.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:16 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:24 eichin * autoconfed isode for kerberos work * @@ -377,7 +380,7 @@ char *s; h -> h_length = sizeof (iaddr); #ifdef h_addr h -> h_addr_list = addrs; - bzero ((char *) addrs, sizeof addrs); + memset ((char *) addrs, 0, sizeof addrs); #endif h -> h_addr = (char *) &iaddr; diff --git a/src/isode/compat/isoaddrs.c b/src/isode/compat/isoaddrs.c index c1a0d5aab..8f30f7e0b 100644 --- a/src/isode/compat/isoaddrs.c +++ b/src/isode/compat/isoaddrs.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:18 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:26 eichin * autoconfed isode for kerberos work * @@ -141,7 +144,7 @@ static int read_macros () return; inited = 1; - bzero ((char *) Mbuckets, sizeof Mbuckets); + memset ((char *) Mbuckets, 0, sizeof Mbuckets); read_file (isodefile (isomacros, 0)); @@ -321,7 +324,7 @@ char *str; LLOG (addr_log, LLOG_DEBUG, ("str2paddr: %s", str)); i = i % 2; - bzero ((char *) pa, sizeof *pa); + memset ((char *) pa, 0, sizeof *pa); (void) strcpy (buf1, str); state = PS_INIT; diff --git a/src/isode/compat/isoservent.c b/src/isode/compat/isoservent.c index ef2d1904c..3946df66c 100644 --- a/src/isode/compat/isoservent.c +++ b/src/isode/compat/isoservent.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:20 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:36 eichin * autoconfed isode for kerberos work * @@ -92,7 +95,7 @@ struct isoservent *getisoservent () { && (servf = fopen (isodefile (isoservices, 0), "r")) == NULL) return NULL; - bzero ((char *) is, sizeof *is); + memset ((char *) is, 0, sizeof *is); while (fgets (buffer, sizeof buffer, servf) != NULL) { if (*buffer == '#') diff --git a/src/isode/compat/na2norm.c b/src/isode/compat/na2norm.c index 254faa8b0..d08ad994c 100644 --- a/src/isode/compat/na2norm.c +++ b/src/isode/compat/na2norm.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:21 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:46 eichin * autoconfed isode for kerberos work * @@ -70,7 +73,7 @@ register struct NSAPaddr *na; return ca; } - bzero ((char *) ca, sizeof *ca); + memset ((char *) ca, 0, sizeof *ca); ca -> na_stack = NA_NSAP; for (ts = ts_interim; ts -> ts_name; ts++) diff --git a/src/isode/compat/pa2str.c b/src/isode/compat/pa2str.c index 8ea39c512..46670ab3e 100644 --- a/src/isode/compat/pa2str.c +++ b/src/isode/compat/pa2str.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:23 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:54 eichin * autoconfed isode for kerberos work * @@ -72,7 +75,7 @@ register struct PSAPaddr *px; n > 2 && n <= m - 2) { /* encoded! */ tz = &px -> pa_addr.sa_addr; - bzero ((char *)ta, sizeof *ta); + memset ((char *)ta, 0, sizeof *ta); if ((ta -> ta_selectlen = m - n - 2) > 0) bcopy (&tz -> ta_selector[n+2], ta -> ta_selector, ta -> ta_selectlen); @@ -95,7 +98,7 @@ register struct PSAPaddr *px; paddr2str (pa, NULLNA)); bp += strlen (bp); - bzero ((char *) pa, sizeof *pa); + memset ((char *) pa, 0, sizeof *pa); *ta = px -> pa_addr.sa_addr; /* struct copy */ ta -> ta_selectlen = 0; } diff --git a/src/isode/compat/saddr2str.c b/src/isode/compat/saddr2str.c index 9d8fb65d2..9aa56c53e 100644 --- a/src/isode/compat/saddr2str.c +++ b/src/isode/compat/saddr2str.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:24 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:27:59 eichin * autoconfed isode for kerberos work * @@ -52,7 +55,7 @@ register struct SSAPaddr *sa; if (!sa) return NULL; - bzero ((char *) pa, sizeof *pa); + memset ((char *) pa, 0, sizeof *pa); pa -> pa_addr = *sa; /* struct copy */ return paddr2str (pa, NULLNA); diff --git a/src/isode/compat/sstr2arg.c b/src/isode/compat/sstr2arg.c index d52c379aa..a872d7bc5 100644 --- a/src/isode/compat/sstr2arg.c +++ b/src/isode/compat/sstr2arg.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:26 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:28:26 eichin * autoconfed isode for kerberos work * @@ -75,7 +78,7 @@ char *dlmstr; /* Delimiting character */ if (srcptr == 0) return (NOTOK); - bzero (idex, sizeof idex); + memset (idex, 0, sizeof idex); for (destptr = dlmstr; *destptr; destptr++) idex[*destptr] = 1; diff --git a/src/isode/compat/str2sel.c b/src/isode/compat/str2sel.c index b8089f6df..152dbcc4a 100644 --- a/src/isode/compat/str2sel.c +++ b/src/isode/compat/str2sel.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:27 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:28:31 eichin * autoconfed isode for kerberos work * @@ -74,7 +77,7 @@ int quoted, i = r; i = implode ((u_char *) sel, s, i); if ((r = (n - i)) > 0) - bzero (sel + i, r); + memset (sel + i, 0, r); return i; } if (*s == '#') { /* gosip style, network byte-order */ diff --git a/src/isode/compat/sunlink.c b/src/isode/compat/sunlink.c index 493e9676d..1b32ded45 100644 --- a/src/isode/compat/sunlink.c +++ b/src/isode/compat/sunlink.c @@ -13,6 +13,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:28 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:28:39 eichin * autoconfed isode for kerberos work * @@ -120,7 +123,7 @@ int backlog, return NOTOK; if (ioctl (sd, X25_SET_FACILITY, &f) == NOTOK) return NOTOK; - bzero ((char *)xs, sizeof *xs); + memset ((char *)xs, 0, sizeof *xs); if (bind (sd, (struct sockaddr *)xs, sizeof *xs) == NOTOK) { SLOG (compat_log, LLOG_EXCEPTIONS, "failed", ("bind")); (void) close_x25_socket (sd); @@ -141,7 +144,7 @@ int backlog, if (local -> na_pidlen > NPSIZE) local -> na_pidlen = NPSIZE; *sock = *xs; /* struct copy */ - bzero((char *) sock -> data, NPSIZE); + memset((char *) sock -> data, 0, NPSIZE); bcopy (local -> na_pid, (char *) sock -> data, local -> na_pidlen); bcopy (local -> na_cudf, (char *) sock -> data + NPSIZE, local -> na_cudflen); @@ -316,7 +319,7 @@ char *caption; { FACILITY_DB facilities; - bzero ((char *) &facilities, sizeof facilities); + memset ((char *) &facilities, 0, sizeof facilities); if (coc != CALLED && ioctl (sd, X25_RD_FACILITY, (char *) &facilities) == NOTOK) { diff --git a/src/isode/compat/taddr2str.c b/src/isode/compat/taddr2str.c index 049b2e5db..1db4ae1ee 100644 --- a/src/isode/compat/taddr2str.c +++ b/src/isode/compat/taddr2str.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:31 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:28:41 eichin * autoconfed isode for kerberos work * @@ -52,7 +55,7 @@ register struct TSAPaddr *ta; if (!ta) return NULL; - bzero ((char *) pa, sizeof *pa); + memset ((char *) pa, 0, sizeof *pa); pa -> pa_addr.sa_addr = *ta; /* struct copy */ return paddr2str (pa, NULLNA); diff --git a/src/isode/compat/x25addr.c b/src/isode/compat/x25addr.c index bb10a7177..ed1a49ad0 100644 --- a/src/isode/compat/x25addr.c +++ b/src/isode/compat/x25addr.c @@ -11,6 +11,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:33 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:28:53 eichin * autoconfed isode for kerberos work * @@ -90,7 +93,7 @@ int context; */ if (generic -> na_stack == NA_NSAP) { - bzero ((char *)specific, sizeof *specific); + memset ((char *)specific, 0, sizeof *specific); return specific; } #endif @@ -172,7 +175,7 @@ int context; #if !defined(CAMTEC_CCL) && !defined(HPUX_X25) - bzero ((char *)specific, sizeof *specific); + memset ((char *)specific, 0, sizeof *specific); #endif #ifdef UBC_X25 @@ -200,7 +203,7 @@ int context; ("PID too long (%d > %d)", generic -> na_pidlen, NPSIZE)); return (CONN_DB *)0; } else { - bzero((char *)specific -> addr.x25pid, NPSIZE); + memset((char *)specific -> addr.x25pid, 0, NPSIZE); bcopy (generic -> na_pid, (char *)specific -> addr.x25pid, specific -> addr.x25pidlen = generic -> na_pidlen); bcopy (generic -> na_pid, (char *)specific -> cudf.x25_cu_data, @@ -252,7 +255,7 @@ int context; ("PID too long (%d > %d)", generic -> na_pidlen, NPSIZE)); return (CONN_DB *)0; } else { - bzero((char *)specific -> data, NPSIZE); + memset((char *)specific -> data, 0, NPSIZE); bcopy (generic -> na_pid, (char *)specific -> data, generic -> na_pidlen); bcopy (generic -> na_cudf, (char *) specific -> data + NPSIZE, @@ -276,7 +279,7 @@ int context; int i; iov -> iov_len = dtelen + 4; - bzero(iov -> iov_base, iov -> iov_len + 1); + memset(iov -> iov_base, 0, iov -> iov_len + 1); a = iov -> iov_base; b = dte; *a++ = '#'; @@ -326,14 +329,14 @@ int context; } /* * CUDF & PID must be merged. malloc initailly PIDsize space - * and bzero it. this may be UK net specific action which + * and zero it. this may be UK net specific action which * ensures we do NOT fall foul of listeners which use pid * to match as well as "true" cudf & DTE. */ (iov = &(specific -> ccl_iovec[2])) -> iov_len = 0; if (generic -> na_faclen != 0) - bcopy (generic -> na_fac, iov -> iov_base, + bcopy (generic -> na_fac, 0, iov -> iov_base, iov -> iov_len = min( generic -> na_faclen, FACSIZE) ); iov++; if ( (iov -> iov_len = generic -> na_pidlen) != 0) @@ -395,8 +398,8 @@ int context; if (generic == NULLNA || specific == (CONN_DB *) 0) return NULLNA; - bzero ((char *)generic, sizeof *generic); - bzero (dte, sizeof dte); + memset ((char *)generic, 0, sizeof *generic); + memset (dte, 0, sizeof dte); dtelen = 0; generic -> na_stack = NA_X25; diff --git a/src/isode/pepsy/etabs.c b/src/isode/pepsy/etabs.c index 806e5ac49..f61008c90 100644 --- a/src/isode/pepsy/etabs.c +++ b/src/isode/pepsy/etabs.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:41 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:30:33 eichin * autoconfed isode for kerberos work * @@ -1611,7 +1614,7 @@ char **ppstr; char *buf; buf = malloc(NBPI / NBPC + 1); - bzero(buf, NBPI / NBPC + 1); + memset(buf, 0, NBPI / NBPC + 1); lastb = -1; ibits = yv->yv_number; for (i = 0; i < NBPI; i++) { @@ -1649,7 +1652,7 @@ char **ppstr; if ((buf = malloc((unsigned)size)) == NULL) { ferrd(1, "valisttobs:malloc:failed on %d\n", size); } - bzero(buf, size); + memset(buf, 0, size); for (yv1 = yv->yv_idlist; yv1 != NULL; yv1 = yv1->yv_next) { if ((yv2 = calc_yv(yp, yv1->yv_identifier)) == NULL) { return (-1); @@ -1661,7 +1664,7 @@ char **ppstr; if ((buf = realloc(buf, (unsigned)nsize)) == NULL) { ferrd(1, "valisttobs:realloc:failed on %d\n", nsize); } - bzero(buf + size, nsize - size); + memset(buf + size, 0, nsize - size); size = nsize; } buf[val / NBPC] |= 1 << (NBPC - 1 - (val % NBPC)); diff --git a/src/isode/psap/addr2ref.c b/src/isode/psap/addr2ref.c index b96b52cfa..314411754 100644 --- a/src/isode/psap/addr2ref.c +++ b/src/isode/psap/addr2ref.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:52 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:32:22 eichin * autoconfed isode for kerberos work * @@ -53,7 +56,7 @@ register char *addr; static struct SSAPref srs; register struct SSAPref *sr = &srs; - bzero ((char *) sr, sizeof *sr); + memset ((char *) sr, 0, sizeof *sr); if ((pe = t61s2prim (addr, strlen (addr))) == NULLPE) return NULL; diff --git a/src/isode/psap/bit_ops.c b/src/isode/psap/bit_ops.c index df2379c79..c7e159db6 100644 --- a/src/isode/psap/bit_ops.c +++ b/src/isode/psap/bit_ops.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:53 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:32:25 eichin * autoconfed isode for kerberos work * @@ -128,7 +131,7 @@ register int n, if (pe -> pe_len < (PElementLen) (len = i + 1)) { if ((bp = PEDalloc (len)) == NULLPED) return NULLPED; - bzero ((char *) bp, len); + memset ((char *) bp, 0, len); if (pe -> pe_prim) { PEDcpy (pe -> pe_prim, bp, pe -> pe_len); if (pe -> pe_inline) @@ -151,7 +154,7 @@ register int n, pe_free (r); return NULLPED; } - bzero ((char *) r -> pe_prim, len); + memset ((char *) r -> pe_prim, 0, len); r -> pe_nbits = j + 1; *mask = 1 << (7 - (j % 8)); for (p = &pe -> pe_cons; q = *p; p = &q -> pe_next) diff --git a/src/isode/psap/int2strb.c b/src/isode/psap/int2strb.c index aa81247aa..6f499c42e 100644 --- a/src/isode/psap/int2strb.c +++ b/src/isode/psap/int2strb.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:55 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:32:42 eichin * autoconfed isode for kerberos work * @@ -46,7 +49,7 @@ int len; register int i; static char buffer[sizeof (int) + 1]; - bzero (buffer, sizeof (buffer)); + memset (buffer, 0, sizeof (buffer)); for (i = 0; i < len; i++) if (n & (1 << i)) buffer[i / 8] |= (1 << (7 - (i % 8))); diff --git a/src/isode/psap/pe_alloc.c b/src/isode/psap/pe_alloc.c index 4be1c0f9b..ee4471e48 100644 --- a/src/isode/psap/pe_alloc.c +++ b/src/isode/psap/pe_alloc.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:56 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:33:20 eichin * autoconfed isode for kerberos work * @@ -105,7 +108,7 @@ PElementID id; pe_list = pe -> pe_next; } - bzero ((char *)pe, sizeof *pe); + memset ((char *)pe, 0, sizeof *pe); pe -> pe_class = class; pe -> pe_form = form; pe -> pe_id = id; diff --git a/src/isode/psap/prim2oid.c b/src/isode/psap/prim2oid.c index 8e56b1ca9..14763bb7c 100644 --- a/src/isode/psap/prim2oid.c +++ b/src/isode/psap/prim2oid.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:57 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:33:45 eichin * autoconfed isode for kerberos work * @@ -54,7 +57,7 @@ register PE pe; register OID o = &oid; if (once_only) { - bzero ((char *) o, sizeof *o); + memset ((char *) o, 0, sizeof *o); once_only = 0; } diff --git a/src/isode/psap/prim2time.c b/src/isode/psap/prim2time.c index 34daaf211..6662b9e24 100644 --- a/src/isode/psap/prim2time.c +++ b/src/isode/psap/prim2time.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 20:59:59 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:33:56 eichin * autoconfed isode for kerberos work * @@ -88,7 +91,7 @@ register int len; static UTCtime ut; register UTC u = &ut; - bzero ((char *) u, sizeof *u); + memset ((char *) u, 0, sizeof *u); if (sscanf (cp, "%2d%2d%2d%2d%2d", &year, &u -> ut_mon, &u -> ut_mday, &u -> ut_hour, &u -> ut_min) != 5) @@ -142,7 +145,7 @@ int len; static UTCtime ut; register UTC u = &ut; - bzero ((char *) u, sizeof *u); + memset ((char *) u, 0, sizeof *u); if (sscanf (cp, "%4d%2d%2d%2d", &u -> ut_year, &u -> ut_mon, &u -> ut_mday, &u -> ut_hour) != 4) diff --git a/src/isode/psap/tm2ut.c b/src/isode/psap/tm2ut.c index 05b6139a0..8b10251d9 100644 --- a/src/isode/psap/tm2ut.c +++ b/src/isode/psap/tm2ut.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 21:00:01 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:35:19 eichin * autoconfed isode for kerberos work * @@ -49,7 +52,7 @@ void tm2ut (tm, ut) register struct tm *tm; register UTC ut; { - bzero ((char *) ut, sizeof *ut); + memset ((char *) ut, 0, sizeof *ut); ut -> ut_year = YEAR (tm -> tm_year); ut -> ut_mon = tm -> tm_mon + 1; diff --git a/src/isode/psap/ut2tm.c b/src/isode/psap/ut2tm.c index 3bbbc8174..6220dcbea 100644 --- a/src/isode/psap/ut2tm.c +++ b/src/isode/psap/ut2tm.c @@ -9,6 +9,9 @@ static char *rcsid = "$Header$"; * * * $Log$ + * Revision 1.2 1994/06/15 21:00:04 eichin + * step 1: bzero->memset(,0,) + * * Revision 1.1 1994/06/10 03:35:24 eichin * autoconfed isode for kerberos work * @@ -54,7 +57,7 @@ register UTC ut; static struct tm tms; register struct tm *tm = &tms; - bzero ((char *) tm, sizeof *tm); + memset ((char *) tm, 0, sizeof *tm); tm -> tm_sec = ut -> ut_sec; tm -> tm_min = ut -> ut_min; diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index 2abeb4053..6a896f55d 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -308,8 +308,8 @@ main(argc, argv) kerror = kdb_verify_master_key (master_key, master_key_schedule, stdout); if (kerror < 0) { klog (L_KRB_PERR, "Can't verify master key."); - bzero (master_key, sizeof (master_key)); - bzero (master_key_schedule, sizeof (master_key_schedule)); + memset (master_key, 0, sizeof (master_key)); + memset (master_key_schedule, 0, sizeof (master_key_schedule)); exit (-1); } @@ -391,9 +391,6 @@ main(argc, argv) static krb5_error_code retval; static krb5_data *response; -#ifndef bzero -void bzero(); -#endif #ifndef bcopy void bcopy(); #endif @@ -436,7 +433,7 @@ krb5_data **resp; client_sockaddr.sin_port = client_fulladdr->port; bcopy( addr->contents, &client_sockaddr.sin_addr, sizeof client_sockaddr.sin_addr); - bzero( client_sockaddr.sin_zero, sizeof client_sockaddr.sin_zero); + memset( client_sockaddr.sin_zero, 0, sizeof client_sockaddr.sin_zero); /* convert v5 packet structure to v5's. * this copy is gross, but necessary: @@ -570,7 +567,7 @@ compat_decrypt_key (in5, out4) retval = 0; bcopy( out5.contents, out4, out5.length); } - bzero( out5.contents, out5.length); + memset( out5.contents, 0, out5.length); krb5_xfree( out5.contents); return( retval); } @@ -814,7 +811,7 @@ kerberos_v4(client, pkt) lifetime = min(req_life, ((u_long) s_name_data.max_life)); lifetime = min(lifetime, ((u_long) a_name_data.max_life)); #ifdef NOENCRYPTION - bzero(session_key, sizeof(C_Block)); + memset(session_key, 0, sizeof(C_Block)); #else /* random session key */ random_key(session_key); @@ -831,8 +828,8 @@ kerberos_v4(client, pkt) a_name_data.instance, local_realm, client_host.s_addr, session_key, lifetime, kerb_time.tv_sec, s_name_data.name, s_name_data.instance, key); - bzero(key, sizeof(key)); - bzero(key_s, sizeof(key_s)); + memset(key, 0, sizeof(key)); + memset(key_s, 0, sizeof(key_s)); /* * get the user's key, unseal it from the server's key, and @@ -853,9 +850,9 @@ kerberos_v4(client, pkt) s_name_data.key_version, tk, kerb_time.tv_sec, key); /* clear session key */ - bzero(session_key, sizeof(session_key)); + memset(session_key, 0, sizeof(session_key)); - bzero(key, sizeof(key)); + memset(key, 0, sizeof(key)); @@ -865,8 +862,8 @@ kerberos_v4(client, pkt) a_name_data.key_version, ciph); krb4_sendto(f, (char *) rpkt->dat, rpkt->length, 0, (struct sockaddr *) client, S_AD_SZ); - bzero(&a_name_data, sizeof(a_name_data)); - bzero(&s_name_data, sizeof(s_name_data)); + memset(&a_name_data, 0, sizeof(a_name_data)); + memset(&s_name_data, 0, sizeof(s_name_data)); break; } case AUTH_MSG_APPL_REQUEST: @@ -953,7 +950,7 @@ kerberos_v4(client, pkt) /* construct and seal the ticket */ #ifdef NOENCRYPTION - bzero(session_key, sizeof(C_Block)); + memset(session_key, 0, sizeof(C_Block)); #else /* random session key */ random_key(session_key); @@ -964,8 +961,8 @@ kerberos_v4(client, pkt) session_key, lifetime, kerb_time.tv_sec, s_name_data.name, s_name_data.instance, key); - bzero(key, sizeof(key)); - bzero(key_s, sizeof(key_s)); + memset(key, 0, sizeof(key)); + memset(key_s, 0, sizeof(key_s)); create_ciph(ciph, session_key, service, instance, local_realm, @@ -973,16 +970,16 @@ kerberos_v4(client, pkt) kerb_time.tv_sec, ad->session); /* clear session key */ - bzero(session_key, sizeof(session_key)); + memset(session_key, 0, sizeof(session_key)); - bzero(ad->session, sizeof(ad->session)); + memset(ad->session, 0, sizeof(ad->session)); rpkt = create_auth_reply(ad->pname, ad->pinst, ad->prealm, time_ws, 0, 0, 0, ciph); krb4_sendto(f, (char *) rpkt->dat, rpkt->length, 0, (struct sockaddr *) client, S_AD_SZ); - bzero(&s_name_data, sizeof(s_name_data)); + memset(&s_name_data, 0, sizeof(s_name_data)); break; } diff --git a/src/krb524/conv_creds.c b/src/krb524/conv_creds.c index c9b7bdf73..598384a17 100644 --- a/src/krb524/conv_creds.c +++ b/src/krb524/conv_creds.c @@ -70,7 +70,7 @@ int krb524_convert_creds_plain(krb5_creds *v5creds, CREDENTIALS *v4creds) krb5_data *comp; int ret; - bzero((char *) v4creds, sizeof(CREDENTIALS)); + memset((char *) v4creds, 0, sizeof(CREDENTIALS)); if (ret = krb524_convert_princs(v5creds->client, v5creds->server, v4creds->pname, v4creds->pinst, diff --git a/src/krb524/getcred.c b/src/krb524/getcred.c index 4b00e02ff..c67ad6025 100644 --- a/src/krb524/getcred.c +++ b/src/krb524/getcred.c @@ -49,7 +49,7 @@ main(int argc, char **argv) exit(1); } - bzero((char *) &v5creds, sizeof(v5creds)); + memset((char *) &v5creds, 0, sizeof(v5creds)); v5creds.client = client; v5creds.server = server; v5creds.times.endtime = 0; diff --git a/src/krb524/k524init.c b/src/krb524/k524init.c index 86d61696f..e11dcc2b7 100644 --- a/src/krb524/k524init.c +++ b/src/krb524/k524init.c @@ -93,7 +93,7 @@ main(int argc, char **argv) } } - bzero((char *) &v5creds, sizeof(v5creds)); + memset((char *) &v5creds, 0, sizeof(v5creds)); v5creds.client = client; v5creds.server = server; v5creds.times.endtime = 0; diff --git a/src/krb524/krb524d.c b/src/krb524/krb524d.c index 505a62e8f..2460ab5f3 100644 --- a/src/krb524/krb524d.c +++ b/src/krb524/krb524d.c @@ -116,7 +116,7 @@ main(int argc, char **argv) if (use_master) init_master(); - bzero((char *) &saddr, sizeof(struct sockaddr_in)); + memset((char *) &saddr, 0, sizeof(struct sockaddr_in)); saddr.sin_family = AF_INET; saddr.sin_addr.s_addr = INADDR_ANY; serv = getservbyname(KRB524_SERVICE, "udp"); diff --git a/src/krb524/test.c b/src/krb524/test.c index 24ba3894f..0aeccada5 100644 --- a/src/krb524/test.c +++ b/src/krb524/test.c @@ -222,7 +222,7 @@ main(int argc, char **argv) exit(1); } - bzero((char *) &v5creds, sizeof(v5creds)); + memset((char *) &v5creds, 0, sizeof(v5creds)); v5creds.client = client; v5creds.server = server; v5creds.times.endtime = 0; @@ -276,7 +276,7 @@ void do_remote(krb5_creds *v5creds, char *server, krb5_keyblock *key) fprintf(stderr, "test: host %s does not exist.\n", server); exit(1); } - bzero((char *) &saddr, sizeof(struct sockaddr_in)); + memset((char *) &saddr, 0, sizeof(struct sockaddr_in)); saddr.sin_family = AF_INET; bcopy(hp->h_addr, (char *) &saddr.sin_addr.s_addr, sizeof(struct in_addr)); diff --git a/src/lib/des425/random_key.c b/src/lib/des425/random_key.c index 0da9a6a85..e8abc8df7 100644 --- a/src/lib/des425/random_key.c +++ b/src/lib/des425/random_key.c @@ -39,7 +39,7 @@ des_random_key(key) mit_des_random_key_seed p_seed; mit_des_cblock nullkey; - bzero(nullkey, sizeof(mit_des_cblock)); + memset(nullkey, 0, sizeof(mit_des_cblock)); mit_des_fixup_key_parity(key); mit_des_init_random_number_generator(nullkey,&p_seed); do { diff --git a/src/lib/des425/read_passwd.c b/src/lib/des425/read_passwd.c index e6c403d49..dfbae4c6e 100644 --- a/src/lib/des425/read_passwd.c +++ b/src/lib/des425/read_passwd.c @@ -61,6 +61,6 @@ des_read_password/*_v4_compat_crock*/(k,prompt,verify) if (ok == 0) des_string_to_key(key_string, k); - bzero(key_string, sizeof (key_string)); + memset(key_string, 0, sizeof (key_string)); return ok; } diff --git a/src/lib/des425/str_to_key.c b/src/lib/des425/str_to_key.c index 06762ea0a..775f08bbe 100644 --- a/src/lib/des425/str_to_key.c +++ b/src/lib/des425/str_to_key.c @@ -77,7 +77,7 @@ des_string_to_key(str,key) length = strlen(str); /* init key array for bits */ - bzero(k_char,sizeof(k_char)); + memset(k_char, 0,sizeof(k_char)); #ifdef DEBUG if (mit_des_debug) @@ -126,7 +126,7 @@ des_string_to_key(str,key) (void) des_key_sched(key,key_sked); (void) des_cbc_cksum((des_cblock *)in_str,key,length,key_sked,key); /* erase key_sked */ - bzero((char *)key_sked,sizeof(key_sked)); + memset((char *)key_sked, 0,sizeof(key_sked)); /* now fix up key parity again */ des_fixup_key_parity(key); diff --git a/src/lib/krb5/asn.1/adr2kadr.c b/src/lib/krb5/asn.1/adr2kadr.c index 16be81110..c1dba53c0 100644 --- a/src/lib/krb5/asn.1/adr2kadr.c +++ b/src/lib/krb5/asn.1/adr2kadr.c @@ -56,7 +56,7 @@ register int *error; *error = ENOMEM; return 0; } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); if (qb_pullup(val->address) != OK) { krb5_xfree(retval); diff --git a/src/lib/krb5/asn.1/aprp2kaprp.c b/src/lib/krb5/asn.1/aprp2kaprp.c index a77c1edf8..a266f1ad9 100644 --- a/src/lib/krb5/asn.1/aprp2kaprp.c +++ b/src/lib/krb5/asn.1/aprp2kaprp.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); temp = KRB5_EncryptedData2krb5_enc_data(val->enc__part, error); if (temp) { diff --git a/src/lib/krb5/asn.1/aprq2kaprq.c b/src/lib/krb5/asn.1/aprq2kaprq.c index c67c01b4d..913bad511 100644 --- a/src/lib/krb5/asn.1/aprq2kaprq.c +++ b/src/lib/krb5/asn.1/aprq2kaprq.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->ap_options = KRB5_APOptions2krb5_apoptions(val->ap__options, error); diff --git a/src/lib/krb5/asn.1/arep2karep.c b/src/lib/krb5/asn.1/arep2karep.c index a123a55e9..165908fe4 100644 --- a/src/lib/krb5/asn.1/arep2karep.c +++ b/src/lib/krb5/asn.1/arep2karep.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->ctime = gentime2unix(val->ctime, error); if (*error) { diff --git a/src/lib/krb5/asn.1/asn1glue.h b/src/lib/krb5/asn.1/asn1glue.h index 4e40afbef..bba57fdf2 100644 --- a/src/lib/krb5/asn.1/asn1glue.h +++ b/src/lib/krb5/asn.1/asn1glue.h @@ -39,7 +39,6 @@ /* to keep lint happy */ #define xbcopy(src,dst,size) memcpy((char *)(dst), (char *)(src), size) -#define xbzero(targ, size) memset((char *)(targ), 0, size) #define xmalloc(n) malloc((unsigned) (n)) #define xcalloc(n,s) calloc((unsigned)(n), (unsigned)(s)) diff --git a/src/lib/krb5/asn.1/auth2kauth.c b/src/lib/krb5/asn.1/auth2kauth.c index 66d00a446..8b49e105f 100644 --- a/src/lib/krb5/asn.1/auth2kauth.c +++ b/src/lib/krb5/asn.1/auth2kauth.c @@ -54,7 +54,7 @@ register int *error; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->client = KRB5_PrincipalName2krb5_principal(val->cname, val->crealm, diff --git a/src/lib/krb5/asn.1/cred2kcred.c b/src/lib/krb5/asn.1/cred2kcred.c index 793ce784f..7e362e846 100644 --- a/src/lib/krb5/asn.1/cred2kcred.c +++ b/src/lib/krb5/asn.1/cred2kcred.c @@ -56,7 +56,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero((char *)retval, sizeof(*retval)); + memset((char *)retval, 0, sizeof(*retval)); /* Count tickets */ for (i = 0, rv = val->tickets; rv; i++, rv = rv->next); @@ -78,7 +78,7 @@ register int *error; krb5_xfree(retval); return(0); } - xbzero((char *)retval->tickets[i], sizeof(*retval->tickets[i])); + memset((char *)retval->tickets[i], 0, sizeof(*retval->tickets[i])); retval->tickets[i] = KRB5_Ticket2krb5_ticket(rv->Ticket, error); if (!retval->tickets[i]) { diff --git a/src/lib/krb5/asn.1/crep2kcrep.c b/src/lib/krb5/asn.1/crep2kcrep.c index 61e79772e..c18879061 100644 --- a/src/lib/krb5/asn.1/crep2kcrep.c +++ b/src/lib/krb5/asn.1/crep2kcrep.c @@ -55,7 +55,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero((char *)retval, sizeof(*retval)); + memset((char *)retval, 0, sizeof(*retval)); /* Count ticket_info */ for (i = 0, rv = val->ticket__info; rv; i++, rv = rv->next); @@ -118,7 +118,7 @@ register int *error; *error = ENOMEM; goto errout; } - xbzero((char *)retval->ticket_info[i], + memset((char *)retval->ticket_info[i], 0, sizeof(*retval->ticket_info[i])); retval->ticket_info[i]->session = diff --git a/src/lib/krb5/asn.1/edat2kedat.c b/src/lib/krb5/asn.1/edat2kedat.c index 4e3f99cff..522b7a056 100644 --- a/src/lib/krb5/asn.1/edat2kedat.c +++ b/src/lib/krb5/asn.1/edat2kedat.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); temp = qbuf2krb5_data(val->cipher, error); if (temp) { diff --git a/src/lib/krb5/asn.1/ekrp2kekrp.c b/src/lib/krb5/asn.1/ekrp2kekrp.c index e161916b3..7a143b0af 100644 --- a/src/lib/krb5/asn.1/ekrp2kekrp.c +++ b/src/lib/krb5/asn.1/ekrp2kekrp.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->session = KRB5_EncryptionKey2krb5_keyblock(val->key, error); if (!retval->session) { diff --git a/src/lib/krb5/asn.1/err2kerr.c b/src/lib/krb5/asn.1/err2kerr.c index 49a279ff1..0cfc19ee1 100644 --- a/src/lib/krb5/asn.1/err2kerr.c +++ b/src/lib/krb5/asn.1/err2kerr.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); if (val->ctime) { diff --git a/src/lib/krb5/asn.1/etpt2ketpt.c b/src/lib/krb5/asn.1/etpt2ketpt.c index de85d394e..737676f88 100644 --- a/src/lib/krb5/asn.1/etpt2ketpt.c +++ b/src/lib/krb5/asn.1/etpt2ketpt.c @@ -59,7 +59,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->flags = KRB5_TicketFlags2krb5_flags(val->flags, error); diff --git a/src/lib/krb5/asn.1/kadat2adat.c b/src/lib/krb5/asn.1/kadat2adat.c index ad712da5a..e05a9c59c 100644 --- a/src/lib/krb5/asn.1/kadat2adat.c +++ b/src/lib/krb5/asn.1/kadat2adat.c @@ -63,7 +63,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->nelem = i; for (i = 0; i < retval->nelem; i++) { retval->element_KRB5_2[i] = (struct element_KRB5_3 *) @@ -103,7 +103,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval) retval = rv2; diff --git a/src/lib/krb5/asn.1/kaddr2addr.c b/src/lib/krb5/asn.1/kaddr2addr.c index cdf4742b2..a4ce52f25 100644 --- a/src/lib/krb5/asn.1/kaddr2addr.c +++ b/src/lib/krb5/asn.1/kaddr2addr.c @@ -68,7 +68,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->nelem = i; for (i = 0; i < retval->nelem; i++) { retval->element_KRB5_0[i] = (struct element_KRB5_1 *) @@ -111,7 +111,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval) retval = rv2; diff --git a/src/lib/krb5/asn.1/kadr2adr.c b/src/lib/krb5/asn.1/kadr2adr.c index 2079ea21f..d3d3a85b1 100644 --- a/src/lib/krb5/asn.1/kadr2adr.c +++ b/src/lib/krb5/asn.1/kadr2adr.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->addr__type = val->addrtype; retval->address = str2qb((char *)val->contents, val->length, 1); if (!retval->address) { diff --git a/src/lib/krb5/asn.1/kaprp2aprp.c b/src/lib/krb5/asn.1/kaprp2aprp.c index f4c7a96dc..a87bc13eb 100644 --- a/src/lib/krb5/asn.1/kaprp2aprp.c +++ b/src/lib/krb5/asn.1/kaprp2aprp.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = KRB5_AP_REP; diff --git a/src/lib/krb5/asn.1/kaprq2aprq.c b/src/lib/krb5/asn.1/kaprq2aprq.c index e3d0b3ef0..eaf879f9d 100644 --- a/src/lib/krb5/asn.1/kaprq2aprq.c +++ b/src/lib/krb5/asn.1/kaprq2aprq.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = KRB5_AP_REQ; diff --git a/src/lib/krb5/asn.1/karep2arep.c b/src/lib/krb5/asn.1/karep2arep.c index bd8d69d60..8284779d0 100644 --- a/src/lib/krb5/asn.1/karep2arep.c +++ b/src/lib/krb5/asn.1/karep2arep.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->ctime = unix2gentime(val->ctime, error); if (!retval->ctime) { diff --git a/src/lib/krb5/asn.1/kauth2auth.c b/src/lib/krb5/asn.1/kauth2auth.c index 77da94179..543fe18c1 100644 --- a/src/lib/krb5/asn.1/kauth2auth.c +++ b/src/lib/krb5/asn.1/kauth2auth.c @@ -54,7 +54,7 @@ register int *error; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->authenticator__vno = KRB5_PVNO; retval->crealm = krb5_data2qbuf(krb5_princ_realm(val->client)); if (!retval->crealm) { diff --git a/src/lib/krb5/asn.1/kcred2cred.c b/src/lib/krb5/asn.1/kcred2cred.c index c796b5361..ae6d06dc9 100644 --- a/src/lib/krb5/asn.1/kcred2cred.c +++ b/src/lib/krb5/asn.1/kcred2cred.c @@ -57,7 +57,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero((char *)retval, sizeof(*retval)); + memset((char *)retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = KRB5_CRED; @@ -79,7 +79,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval->tickets) retval->tickets = rv2; diff --git a/src/lib/krb5/asn.1/kcrep2crep.c b/src/lib/krb5/asn.1/kcrep2crep.c index 9ae8875a4..856fb69d6 100644 --- a/src/lib/krb5/asn.1/kcrep2crep.c +++ b/src/lib/krb5/asn.1/kcrep2crep.c @@ -56,7 +56,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero((char *)retval, sizeof (*retval)); + memset((char *)retval, 0, sizeof (*retval)); if (val->nonce) { retval->nonce = val->nonce; @@ -98,7 +98,7 @@ register int *error; if (!rv2) goto errout; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (rv1) rv1->next = rv2; @@ -110,7 +110,7 @@ register int *error; xmalloc(sizeof(*(rv2->KRB__CRED__INFO))); if (!rv2->KRB__CRED__INFO) goto errout; - xbzero((char *)rv2->KRB__CRED__INFO, sizeof (*rv2->KRB__CRED__INFO)); + memset((char *)rv2->KRB__CRED__INFO, 0, sizeof (*rv2->KRB__CRED__INFO)); rv2->KRB__CRED__INFO->key = krb5_keyblock2KRB5_EncryptionKey(val->ticket_info[i]->session, diff --git a/src/lib/krb5/asn.1/kdcr2kkdcr.c b/src/lib/krb5/asn.1/kdcr2kkdcr.c index 01ee74759..5676fedb0 100644 --- a/src/lib/krb5/asn.1/kdcr2kkdcr.c +++ b/src/lib/krb5/asn.1/kdcr2kkdcr.c @@ -107,7 +107,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->msg_type = val->msg__type; diff --git a/src/lib/krb5/asn.1/kedat2edat.c b/src/lib/krb5/asn.1/kedat2edat.c index 6df7d2cc9..0fe508647 100644 --- a/src/lib/krb5/asn.1/kedat2edat.c +++ b/src/lib/krb5/asn.1/kedat2edat.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->etype = val->etype; retval->cipher = krb5_data2qbuf(&(val->ciphertext)); diff --git a/src/lib/krb5/asn.1/kekrp2ekrp.c b/src/lib/krb5/asn.1/kekrp2ekrp.c index ecf814d45..10d54e391 100644 --- a/src/lib/krb5/asn.1/kekrp2ekrp.c +++ b/src/lib/krb5/asn.1/kekrp2ekrp.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->key = krb5_keyblock2KRB5_EncryptionKey(val->session, error); if (!retval->key) { diff --git a/src/lib/krb5/asn.1/kerr2err.c b/src/lib/krb5/asn.1/kerr2err.c index 5f3513d80..75d57c7a4 100644 --- a/src/lib/krb5/asn.1/kerr2err.c +++ b/src/lib/krb5/asn.1/kerr2err.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = KRB5_ERROR; diff --git a/src/lib/krb5/asn.1/ketpt2etpt.c b/src/lib/krb5/asn.1/ketpt2etpt.c index 28e75c097..db6d5f0ba 100644 --- a/src/lib/krb5/asn.1/ketpt2etpt.c +++ b/src/lib/krb5/asn.1/ketpt2etpt.c @@ -49,7 +49,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->flags = krb5_flags2KRB5_TicketFlags(val->flags, error); if (*error) { diff --git a/src/lib/krb5/asn.1/kkdcr2kdcr.c b/src/lib/krb5/asn.1/kkdcr2kdcr.c index 1a0a8ab69..5464dd1f8 100644 --- a/src/lib/krb5/asn.1/kkdcr2kdcr.c +++ b/src/lib/krb5/asn.1/kkdcr2kdcr.c @@ -70,7 +70,7 @@ struct element_KRB5_11 *krb5_pa_data2element_KRB5_11(val, error) } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval) retval = rv2; @@ -104,7 +104,7 @@ OLDDECLARG(register int *,error) *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = val->msg_type; diff --git a/src/lib/krb5/asn.1/klsrq2lsrq.c b/src/lib/krb5/asn.1/klsrq2lsrq.c index 3c4c3ab6d..ea0e80c33 100644 --- a/src/lib/krb5/asn.1/klsrq2lsrq.c +++ b/src/lib/krb5/asn.1/klsrq2lsrq.c @@ -63,7 +63,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->nelem = i; for (i = 0; i < retval->nelem; i++) { retval->element_KRB5_4[i] = (struct element_KRB5_5 *) @@ -100,7 +100,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval) retval = rv2; diff --git a/src/lib/krb5/asn.1/kprep2prep.c b/src/lib/krb5/asn.1/kprep2prep.c index 8235c6e85..7be1b5326 100644 --- a/src/lib/krb5/asn.1/kprep2prep.c +++ b/src/lib/krb5/asn.1/kprep2prep.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->user__data = krb5_data2qbuf(&(val->user_data)); if (!retval->user__data) { diff --git a/src/lib/krb5/asn.1/kprin2prin.c b/src/lib/krb5/asn.1/kprin2prin.c index d5dde3417..02bb8b51f 100644 --- a/src/lib/krb5/asn.1/kprin2prin.c +++ b/src/lib/krb5/asn.1/kprin2prin.c @@ -70,7 +70,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!namestring) namestring = rv2; diff --git a/src/lib/krb5/asn.1/kpriv2priv.c b/src/lib/krb5/asn.1/kpriv2priv.c index 77e1e973f..98120da53 100644 --- a/src/lib/krb5/asn.1/kpriv2priv.c +++ b/src/lib/krb5/asn.1/kpriv2priv.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = KRB5_PRIV; diff --git a/src/lib/krb5/asn.1/ksafe2safe.c b/src/lib/krb5/asn.1/ksafe2safe.c index a522e235f..6fe83358f 100644 --- a/src/lib/krb5/asn.1/ksafe2safe.c +++ b/src/lib/krb5/asn.1/ksafe2safe.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); rv2 = (struct type_KRB5_KRB__SAFE__BODY *)xmalloc(sizeof(*rv2)); if (!rv2) { @@ -62,7 +62,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(rv2, sizeof(*rv2)); + memset(rv2, 0, sizeof(*rv2)); retval->pvno = KRB5_PVNO; retval->msg__type = KRB5_SAFE; diff --git a/src/lib/krb5/asn.1/ktgrq2tgrq.c b/src/lib/krb5/asn.1/ktgrq2tgrq.c index d980cb22f..e10222828 100644 --- a/src/lib/krb5/asn.1/ktgrq2tgrq.c +++ b/src/lib/krb5/asn.1/ktgrq2tgrq.c @@ -54,7 +54,7 @@ register int *error; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->kdc__options = krb5_kdcoptions2KRB5_KDCOptions(val->kdc_options, @@ -123,7 +123,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval->etype) retval->etype = rv2; rv2->element_KRB5_9 = val->etype[i]; @@ -161,7 +161,7 @@ register int *error; *error = ENOMEM; goto errout; } - xbzero(adtk, sizeof(*adtk)); + memset(adtk, 0, sizeof(*adtk)); adtk->nelem = i; for (i = 0; i < adtk->nelem; i++) { adtk->Ticket[i] = krb5_ticket2KRB5_Ticket(val->second_ticket[i], @@ -191,7 +191,7 @@ register int *error; } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!adtk) adtk = rv2; @@ -218,7 +218,7 @@ register int *error; *error = ENOMEM; goto errout; } - xbzero(adtk, sizeof(*adtk)); + memset(adtk, 0, sizeof(*adtk)); adtk->nelem = 0; retval->additional__tickets = adtk; #endif @@ -260,7 +260,7 @@ struct element_KRB5_7 *krb5_pa_data2element_KRB5_7(val, error) } if (rv1) rv1->next = rv2; - xbzero((char *)rv2, sizeof (*rv2)); + memset((char *)rv2, 0, sizeof (*rv2)); if (!retval) retval = rv2; @@ -293,7 +293,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->pvno = KRB5_PVNO; retval->msg__type = val->msg_type; if (val->padata) { diff --git a/src/lib/krb5/asn.1/ktkt2tkt.c b/src/lib/krb5/asn.1/ktkt2tkt.c index 023de917a..8b7eabce1 100644 --- a/src/lib/krb5/asn.1/ktkt2tkt.c +++ b/src/lib/krb5/asn.1/ktkt2tkt.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->tkt__vno = KRB5_PVNO; retval->realm = krb5_data2qbuf(krb5_princ_realm(val->server)); diff --git a/src/lib/krb5/asn.1/ktran2tran.c b/src/lib/krb5/asn.1/ktran2tran.c index 5e66e855f..968d74b0f 100644 --- a/src/lib/krb5/asn.1/ktran2tran.c +++ b/src/lib/krb5/asn.1/ktran2tran.c @@ -53,7 +53,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->tr__type = val->tr_type; retval->contents = krb5_data2qbuf(&val->tr_contents); diff --git a/src/lib/krb5/asn.1/prep2kprep.c b/src/lib/krb5/asn.1/prep2kprep.c index 78a5d5baf..015548748 100644 --- a/src/lib/krb5/asn.1/prep2kprep.c +++ b/src/lib/krb5/asn.1/prep2kprep.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); temp = qbuf2krb5_data(val->user__data, error); if (temp) { diff --git a/src/lib/krb5/asn.1/priv2kpriv.c b/src/lib/krb5/asn.1/priv2kpriv.c index 9ddb4ae88..4e92054cb 100644 --- a/src/lib/krb5/asn.1/priv2kpriv.c +++ b/src/lib/krb5/asn.1/priv2kpriv.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); temp = KRB5_EncryptedData2krb5_enc_data(val->enc__part, error); if (temp) { diff --git a/src/lib/krb5/asn.1/safe2ksafe.c b/src/lib/krb5/asn.1/safe2ksafe.c index 57484139a..3d7893686 100644 --- a/src/lib/krb5/asn.1/safe2ksafe.c +++ b/src/lib/krb5/asn.1/safe2ksafe.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); temp = qbuf2krb5_data(val->safe__body->user__data, error); if (temp) { diff --git a/src/lib/krb5/asn.1/tgrq2ktgrq.c b/src/lib/krb5/asn.1/tgrq2ktgrq.c index 5caf36211..ec5f95ecf 100644 --- a/src/lib/krb5/asn.1/tgrq2ktgrq.c +++ b/src/lib/krb5/asn.1/tgrq2ktgrq.c @@ -57,7 +57,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->kdc_options = KRB5_KDCOptions2krb5_kdcoptions(val->kdc__options, diff --git a/src/lib/krb5/asn.1/tkt2ktkt.c b/src/lib/krb5/asn.1/tkt2ktkt.c index 1af077727..7ffbbc38c 100644 --- a/src/lib/krb5/asn.1/tkt2ktkt.c +++ b/src/lib/krb5/asn.1/tkt2ktkt.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->server = KRB5_PrincipalName2krb5_principal(val->sname, diff --git a/src/lib/krb5/asn.1/tran2ktran.c b/src/lib/krb5/asn.1/tran2ktran.c index 1d0bb7ae1..9fbd5df25 100644 --- a/src/lib/krb5/asn.1/tran2ktran.c +++ b/src/lib/krb5/asn.1/tran2ktran.c @@ -54,7 +54,7 @@ register int *error; *error = ENOMEM; return(0); } - xbzero(retval, sizeof(*retval)); + memset(retval, 0, sizeof(*retval)); retval->tr_type = val->tr__type; temp = qbuf2krb5_data(val->contents, error); diff --git a/src/lib/krb5/ccache/stdio/scc_maybe.c b/src/lib/krb5/ccache/stdio/scc_maybe.c index 34ffa13f0..ea9ff076f 100644 --- a/src/lib/krb5/ccache/stdio/scc_maybe.c +++ b/src/lib/krb5/ccache/stdio/scc_maybe.c @@ -65,7 +65,7 @@ krb5_scc_close_file (id) (failed) syscall */ if (ret == EOF && !errno) ret = 0; #endif - bzero (data->stdio_buffer, sizeof (data->stdio_buffer)); + memset (data->stdio_buffer, 0, sizeof (data->stdio_buffer)); if (ret == EOF) { int errsave = errno; (void) krb5_unlock_file(data->file, data->filename); -- 2.26.2