step 1: bzero->memset(,0,)

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

45 files changed, 61 insertions, 62 deletions

diff --git a/src/lib/des425/random_key.c b/src/lib/des425/random_key.c
index 0da9a6a858..e8abc8df71 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 e6c403d496..dfbae4c6ea 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 06762ea0a5..775f08bbeb 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 16be811106..c1dba53c0a 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 a77c1edf88..a266f1ad99 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 c67c01b4d1..913bad511f 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 a123a55e92..165908fe4b 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 4e40afbef3..bba57fdf2b 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 66d00a4466..8b49e105fa 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 793ce784fe..7e362e8466 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 61e79772e1..c188790612 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 4e3f99cff0..522b7a0568 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 e161916b34..7a143b0afc 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 49a279ff1b..0cfc19ee14 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 de85d394e4..737676f88a 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 ad712da5a1..e05a9c59c0 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 cdf4742b21..a4ce52f25f 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 2079ea21f3..d3d3a85b1c 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 f4c7a96dc1..a87bc13ebe 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 e3d0b3ef00..eaf879f9d4 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 bd8d69d609..8284779d02 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 77da94179b..543fe18c1a 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 c796b53614..ae6d06dc98 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 9ae8875a42..856fb69d6a 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 01ee747596..5676fedb0c 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 6df7d2cc95..0fe5086478 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 ecf814d454..10d54e3912 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 5f3513d808..75d57c7a44 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 28e75c0974..db6d5f0ba4 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 1a0a8ab69a..5464dd1f87 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 3c4c3ab6dc..ea0e80c336 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 8235c6e859..7be1b5326a 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 d5dde34179..02bb8b51fd 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 77e1e973f2..98120da530 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 a522e235f1..6fe83358fe 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 d980cb22f7..e102228282 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 023de917ab..8b7eabce19 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 5e66e855f8..968d74b0f5 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 78a5d5baf7..0155487486 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 9ddb4ae887..4e92054cb1 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 57484139ae..3d78936869 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 5caf362114..ec5f95ecf0 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 1af0777271..7ffbbc38cc 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 1d0bb7ae12..9fbd5df258 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 34ffa13f0a..ea9ff076fe 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);