sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

bcopy must DIE ! Stop people creeping use of bcopy back into the code

Browse Source 
(and yes I know who you are..... :-).
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent d09ae0c667
commit 330b0df960
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/include/safe_string.h
View File

@ -26,6 +26,11 @@
/* Some macros to ensure people don't use buffer overflow vulnerable string
functions. */
#ifdef bcopy
#undef bcopy
#endif /* bcopy */
#define bcopy(src,dest,size) __ERROR__XX__NEVER_USE_BCOPY___;
#ifdef strcpy
#undef strcpy
#endif /* strcpy */

11
source/lib/hmacmd5.c
View File

@ -49,8 +49,8 @@ void hmac_md5_init_rfc2104(uchar* key, int key_len, HMACMD5Context *ctx)
/* start out by storing key in pads */
ZERO_STRUCT(ctx->k_ipad);
ZERO_STRUCT(ctx->k_opad);
bcopy( key, ctx->k_ipad, key_len);
bcopy( key, ctx->k_opad, key_len);
memcpy( ctx->k_ipad, key, key_len);
memcpy( ctx->k_opad, key, key_len);
/* XOR key with ipad and opad values */
for (i=0; i<64; i++)
@ -80,12 +80,11 @@ void hmac_md5_init_limK_to_64(const uchar* key, int key_len,
/* start out by storing key in pads */
ZERO_STRUCT(ctx->k_ipad);
ZERO_STRUCT(ctx->k_opad);
bcopy( key, ctx->k_ipad, key_len);
bcopy( key, ctx->k_opad, key_len);
memcpy( ctx->k_ipad, key, key_len);
memcpy( ctx->k_opad, key, key_len);
/* XOR key with ipad and opad values */
for (i=0; i<64; i++)
{
for (i=0; i<64; i++) {
ctx->k_ipad[i] ^= 0x36;
ctx->k_opad[i] ^= 0x5c;
}

2
source/libsmb/clidgram.c
View File

@ -117,7 +117,7 @@ int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int
/* Copy the data to buffer, respecting sizes ... */
bcopy(&dgram->data[92], buf, MIN(bufsiz, (dgram->datasize - 92)));
memset(buf, &dgram->data[92], MIN(bufsiz, (dgram->datasize - 92)));
}
else

4
source/libsmb/libsmbclient.c
View File

@ -1908,7 +1908,7 @@ struct smbc_dirent *smbc_readdir(unsigned int fd)
/* Hmmm, do I even need to copy it? */
bcopy(dirent, smbc_local_dirent, dirent->dirlen); /* Copy the dirent */
memcpy(smbc_local_dirent, dirent, dirent->dirlen); /* Copy the dirent */
dirp = (struct smbc_dirent *)smbc_local_dirent;
@ -2000,7 +2000,7 @@ int smbc_getdents(unsigned int fd, struct smbc_dirent *dirp, int count)
dirent = dir->dirent;
bcopy(dirent, ndir, reqd); /* Copy the data in ... */
memcpy(ndir, dirent, reqd); /* Copy the data in ... */
((struct smbc_dirent *)ndir)->comment =
(char *)(&((struct smbc_dirent *)ndir)->name + dirent->namelen + 1);