From b608734a390338659a427a8544d9beff04f68646 Mon Sep 17 00:00:00 2001 From: Mark Eichin Date: Wed, 15 Jun 1994 23:46:13 +0000 Subject: [PATCH] step 3: bcopy->memcpy or memmove (chose by hand), twiddle args git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3821 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/des425/pcbc_encrypt.c | 36 ++++++++++++++++----------------- src/lib/krb5/asn.1/adat2kadat.c | 10 +++++---- src/lib/krb5/asn.1/addr2kaddr.c | 10 +++++---- src/lib/krb5/asn.1/adr2kadr.c | 3 +-- src/lib/krb5/asn.1/ck2kck.c | 4 ++-- src/lib/krb5/asn.1/enck2kkey.c | 4 ++-- src/lib/krb5/asn.1/kdcr2kkdcr.c | 5 +++-- src/lib/krb5/asn.1/qbuf2data.c | 4 ++-- src/lib/krb5/asn.1/tgrq2ktgrq.c | 5 +++-- src/lib/krb5/posix/strdup.c | 2 +- src/slave/kprop.c | 2 +- 11 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/lib/des425/pcbc_encrypt.c b/src/lib/des425/pcbc_encrypt.c index e533a0db2..8f85d2eda 100644 --- a/src/lib/des425/pcbc_encrypt.c +++ b/src/lib/des425/pcbc_encrypt.c @@ -102,8 +102,8 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) if (encrypt) { #ifdef MUSTALIGN if ((long) ivec & 3) { - bcopy((char *)ivec++,(char *)&xor_0,sizeof(xor_0)); - bcopy((char *)ivec,(char *)&xor_1,sizeof(xor_1)); + memcpy((char *)&xor_0, (char *)ivec++,sizeof(xor_0)); + memcpy((char *)&xor_1, (char *)ivec, sizeof(xor_1)); } else #endif @@ -116,8 +116,8 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) /* get input */ #ifdef MUSTALIGN if ((long) input & 3) { - bcopy((char *)input,(char *)&t_input[0],sizeof(t_input[0])); - bcopy((char *)(input+1),(char *)&t_input[1],sizeof(t_input[1])); + memcpy((char *)&t_input[0], (char *)input, sizeof(t_input[0])); + memcpy((char *)&t_input[1], (char *)(input+1),sizeof(t_input[1])); } else #endif @@ -149,9 +149,9 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) */ #ifdef MUSTALIGN if ((long) input & 3) { - bcopy((char *)input++,(char *)&xor_0,sizeof(xor_0)); + memcpy((char *)&xor_0, (char *)input++, sizeof(xor_0)); xor_0 ^= t_output[0]; - bcopy((char *)input++,(char *)&xor_1,sizeof(xor_1)); + memcpy((char *)&xor_1, (char *)input++, sizeof(xor_1)); xor_1 ^= t_output[1]; } else @@ -165,10 +165,10 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) /* copy temp output and save it for cbc */ #ifdef MUSTALIGN if ((long) output & 3) { - bcopy((char *)&t_output[0],(char *)output++, - sizeof(t_output[0])); - bcopy((char *)&t_output[1],(char *)output++, - sizeof(t_output[1])); + memcpy((char *)output++, (char *)&t_output[0], + sizeof(t_output[0])); + memcpy((char *)output++, (char *)&t_output[1], + sizeof(t_output[1])); } else #endif @@ -195,8 +195,8 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) /* decrypt */ #ifdef MUSTALIGN if ((long) ivec & 3) { - bcopy((char *)ivec++,(char *)&xor_0,sizeof(xor_0)); - bcopy((char *)ivec,(char *)&xor_1,sizeof(xor_1)); + memcpy((char *)&xor_0, (char *)ivec++,sizeof(xor_0)); + memcpy((char *)&xor_1, (char *)ivec, sizeof(xor_1)); } else #endif @@ -209,8 +209,8 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) /* get input */ #ifdef MUSTALIGN if ((long) input & 3) { - bcopy((char *)input++,(char *)&t_input[0],sizeof(t_input[0])); - bcopy((char *)input++,(char *)&t_input[1],sizeof(t_input[1])); + memcpy((char *)&t_input[0],(char *)input++,sizeof(t_input[0])); + memcpy((char *)&t_input[1],(char *)input++,sizeof(t_input[1])); } else #endif @@ -240,10 +240,10 @@ des_pcbc_encrypt(in,out,length,key,iv,encrypt) /* copy temp output */ #ifdef MUSTALIGN if ((long) output & 3) { - bcopy((char *)&t_output[0],(char *)output++, - sizeof(t_output[0])); - bcopy((char *)&t_output[1],(char *)output++, - sizeof(t_output[1])); + memcpy((char *)output++, (char *)&t_output[0], + sizeof(t_output[0])); + memcpy((char *)output++, (char *)&t_output[1], + sizeof(t_output[1])); } else #endif diff --git a/src/lib/krb5/asn.1/adat2kadat.c b/src/lib/krb5/asn.1/adat2kadat.c index c2669fd2d..4ee79c008 100644 --- a/src/lib/krb5/asn.1/adat2kadat.c +++ b/src/lib/krb5/asn.1/adat2kadat.c @@ -80,8 +80,9 @@ register int *error; } retval[i]->ad_type = val->element_KRB5_2[i]->ad__type; retval[i]->length = val->element_KRB5_2[i]->ad__data->qb_forw->qb_len; - xbcopy(val->element_KRB5_2[i]->ad__data->qb_forw->qb_data, - &retval[i]->contents[0], retval[i]->length); + memcpy(&retval[i]->contents[0], + val->element_KRB5_2[i]->ad__data->qb_forw->qb_data, + retval[i]->length); } retval[i] = 0; return(retval); @@ -120,8 +121,9 @@ register int *error; } retval[i]->ad_type = rv->element_KRB5_2->ad__type; retval[i]->length = rv->element_KRB5_2->ad__data->qb_forw->qb_len; - xbcopy(rv->element_KRB5_2->ad__data->qb_forw->qb_data, - retval[i]->contents, retval[i]->length); + memcpy(retval[i]->contents, + rv->element_KRB5_2->ad__data->qb_forw->qb_data, + retval[i]->length); } retval[i] = 0; return(retval); diff --git a/src/lib/krb5/asn.1/addr2kaddr.c b/src/lib/krb5/asn.1/addr2kaddr.c index db93c8081..5c1697707 100644 --- a/src/lib/krb5/asn.1/addr2kaddr.c +++ b/src/lib/krb5/asn.1/addr2kaddr.c @@ -81,8 +81,9 @@ register int *error; } retval[i]->addrtype = val->element_KRB5_0[i]->addr__type; retval[i]->length = val->element_KRB5_0[i]->address->qb_forw->qb_len; - xbcopy(val->element_KRB5_0[i]->address->qb_forw->qb_data, - retval[i]->contents, retval[i]->length); + memcpy(retval[i]->contents, + val->element_KRB5_0[i]->address->qb_forw->qb_data, + retval[i]->length); } retval[i] = 0; return(retval); @@ -121,8 +122,9 @@ register int *error; } retval[i]->addrtype = rv->element_KRB5_0->addr__type; retval[i]->length = rv->element_KRB5_0->address->qb_forw->qb_len; - xbcopy(rv->element_KRB5_0->address->qb_forw->qb_data, - retval[i]->contents, retval[i]->length); + memcpy(retval[i]->contents, + rv->element_KRB5_0->address->qb_forw->qb_data, + retval[i]->length); } retval[i] = 0; return(retval); diff --git a/src/lib/krb5/asn.1/adr2kadr.c b/src/lib/krb5/asn.1/adr2kadr.c index c1dba53c0..ded8526e2 100644 --- a/src/lib/krb5/asn.1/adr2kadr.c +++ b/src/lib/krb5/asn.1/adr2kadr.c @@ -69,8 +69,7 @@ register int *error; } retval->addrtype = val->addr__type; retval->length = val->address->qb_forw->qb_len; - xbcopy(val->address->qb_forw->qb_data, - retval->contents, retval->length); + memcpy(retval->contents, val->address->qb_forw->qb_data, retval->length); return(retval); } diff --git a/src/lib/krb5/asn.1/ck2kck.c b/src/lib/krb5/asn.1/ck2kck.c index fc4c725ab..b305d99ad 100644 --- a/src/lib/krb5/asn.1/ck2kck.c +++ b/src/lib/krb5/asn.1/ck2kck.c @@ -70,7 +70,7 @@ register int *error; } retval->checksum_type = val->cksumtype; retval->length = val->checksum->qb_forw->qb_len; - xbcopy(val->checksum->qb_forw->qb_data, retval->contents, - val->checksum->qb_forw->qb_len); + memcpy(retval->contents, val->checksum->qb_forw->qb_data, + val->checksum->qb_forw->qb_len); return(retval); } diff --git a/src/lib/krb5/asn.1/enck2kkey.c b/src/lib/krb5/asn.1/enck2kkey.c index 9ad82e456..700d1afb5 100644 --- a/src/lib/krb5/asn.1/enck2kkey.c +++ b/src/lib/krb5/asn.1/enck2kkey.c @@ -71,8 +71,8 @@ register int *error; } retval->keytype = val->keytype; retval->length = val->keyvalue->qb_forw->qb_len; - xbcopy(val->keyvalue->qb_forw->qb_data, retval->contents, - val->keyvalue->qb_forw->qb_len); + memcpy(retval->contents, val->keyvalue->qb_forw->qb_data, + val->keyvalue->qb_forw->qb_len); return(retval); } diff --git a/src/lib/krb5/asn.1/kdcr2kkdcr.c b/src/lib/krb5/asn.1/kdcr2kkdcr.c index 5676fedb0..d6e5694d3 100644 --- a/src/lib/krb5/asn.1/kdcr2kkdcr.c +++ b/src/lib/krb5/asn.1/kdcr2kkdcr.c @@ -84,8 +84,9 @@ element_KRB5_112krb5_pa_data(val, error) *error = ENOMEM; return(0); } - xbcopy(rv->PA__DATA->pa__data->qb_forw->qb_data, - retval[i]->contents, retval[i]->length); + memcpy(retval[i]->contents, + rv->PA__DATA->pa__data->qb_forw->qb_data, + retval[i]->length); } else retval[i]->contents = 0; } diff --git a/src/lib/krb5/asn.1/qbuf2data.c b/src/lib/krb5/asn.1/qbuf2data.c index 1e36ce53a..a11ee8f43 100644 --- a/src/lib/krb5/asn.1/qbuf2data.c +++ b/src/lib/krb5/asn.1/qbuf2data.c @@ -68,8 +68,8 @@ register int *error; krb5_xfree(retval); goto nomem; } - xbcopy(val->qb_forw->qb_data, retval->data, - val->qb_forw->qb_len); + memcpy(retval->data, val->qb_forw->qb_data, + val->qb_forw->qb_len); return(retval); } diff --git a/src/lib/krb5/asn.1/tgrq2ktgrq.c b/src/lib/krb5/asn.1/tgrq2ktgrq.c index ec5f95ecf..6dc7baa33 100644 --- a/src/lib/krb5/asn.1/tgrq2ktgrq.c +++ b/src/lib/krb5/asn.1/tgrq2ktgrq.c @@ -243,8 +243,9 @@ element_KRB5_72krb5_pa_data(val, error) *error = ENOMEM; return(0); } - xbcopy(rv->PA__DATA->pa__data->qb_forw->qb_data, - retval[i]->contents, retval[i]->length); + memcpy(retval[i]->contents, + rv->PA__DATA->pa__data->qb_forw->qb_data, + retval[i]->length); } } retval[i] = 0; diff --git a/src/lib/krb5/posix/strdup.c b/src/lib/krb5/posix/strdup.c index 838572090..f58d9367f 100644 --- a/src/lib/krb5/posix/strdup.c +++ b/src/lib/krb5/posix/strdup.c @@ -36,6 +36,6 @@ strdup(str) len = strlen(str) + 1; if (!(copy = malloc((u_int)len))) return((char *)0); - bcopy(str, copy, len); + memcpy(copy, str, len); return(copy); } diff --git a/src/slave/kprop.c b/src/slave/kprop.c index 91a7b65aa..ae6c20a3f 100644 --- a/src/slave/kprop.c +++ b/src/slave/kprop.c @@ -317,7 +317,7 @@ open_connection(host, fd, Errmsg) return(0); } sin.sin_family = hp->h_addrtype; - bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length); + memcpy((char *)&sin.sin_addr, hp->h_addr, hp->h_length); sin.sin_port = sp->s_port; s = socket(AF_INET, SOCK_STREAM, 0); -- 2.26.2