Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb83e592

Browse files
committed
Replace bcopy by memmove for more portability.
1 parent0ffe11a commitb83e592

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

‎contrib/pgcrypto/md5.c

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*$PostgreSQL: pgsql/contrib/pgcrypto/md5.c,v 1.11 2004/05/07 00:24:57 tgl Exp $*/
1+
/*$PostgreSQL: pgsql/contrib/pgcrypto/md5.c,v 1.12 2004/08/29 16:43:05 tgl Exp $*/
22
/* $KAME: md5.c,v 1.3 2000/02/22 14:01:17 itojun Exp $ */
33

44
/*
@@ -155,20 +155,18 @@ md5_loop(md5_ctxt * ctxt, const uint8 *input, unsigned len)
155155

156156
if (len >=gap)
157157
{
158-
bcopy((void*)input, (void*) (ctxt->md5_buf+ctxt->md5_i),
159-
gap);
158+
memmove(ctxt->md5_buf+ctxt->md5_i,input,gap);
160159
md5_calc(ctxt->md5_buf,ctxt);
161160

162161
for (i=gap;i+MD5_BUFLEN <=len;i+=MD5_BUFLEN)
163162
md5_calc((uint8*) (input+i),ctxt);
164163

165164
ctxt->md5_i=len-i;
166-
bcopy((void*) (input+i), (void*)ctxt->md5_buf,ctxt->md5_i);
165+
memmove(ctxt->md5_buf,input+i,ctxt->md5_i);
167166
}
168167
else
169168
{
170-
bcopy((void*)input, (void*) (ctxt->md5_buf+ctxt->md5_i),
171-
len);
169+
memmove(ctxt->md5_buf+ctxt->md5_i,input,len);
172170
ctxt->md5_i+=len;
173171
}
174172
}
@@ -182,24 +180,21 @@ md5_pad(md5_ctxt * ctxt)
182180
gap=MD5_BUFLEN-ctxt->md5_i;
183181
if (gap>8)
184182
{
185-
bcopy((void*)md5_paddat,
186-
(void*) (ctxt->md5_buf+ctxt->md5_i),
187-
gap-sizeof(ctxt->md5_n));
183+
memmove(ctxt->md5_buf+ctxt->md5_i,md5_paddat,
184+
gap-sizeof(ctxt->md5_n));
188185
}
189186
else
190187
{
191188
/* including gap == 8 */
192-
bcopy((void*)md5_paddat, (void*) (ctxt->md5_buf+ctxt->md5_i),
193-
gap);
189+
memmove(ctxt->md5_buf+ctxt->md5_i,md5_paddat,gap);
194190
md5_calc(ctxt->md5_buf,ctxt);
195-
bcopy((void*) (md5_paddat+gap),
196-
(void*)ctxt->md5_buf,
197-
MD5_BUFLEN-sizeof(ctxt->md5_n));
191+
memmove(ctxt->md5_buf,md5_paddat+gap,
192+
MD5_BUFLEN-sizeof(ctxt->md5_n));
198193
}
199194

200195
/* 8 byte word */
201196
#ifBYTE_ORDER==LITTLE_ENDIAN
202-
bcopy(&ctxt->md5_n8[0],&ctxt->md5_buf[56],8);
197+
memmove(&ctxt->md5_buf[56],&ctxt->md5_n8[0],8);
203198
#endif
204199
#ifBYTE_ORDER==BIG_ENDIAN
205200
ctxt->md5_buf[56]=ctxt->md5_n8[7];
@@ -220,7 +215,7 @@ md5_result(uint8 *digest, md5_ctxt * ctxt)
220215
{
221216
/* 4 byte words */
222217
#ifBYTE_ORDER==LITTLE_ENDIAN
223-
bcopy(&ctxt->md5_st8[0],digest,16);
218+
memmove(digest,&ctxt->md5_st8[0],16);
224219
#endif
225220
#ifBYTE_ORDER==BIG_ENDIAN
226221
digest[0]=ctxt->md5_st8[3];

‎contrib/pgcrypto/sha1.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*$PostgreSQL: pgsql/contrib/pgcrypto/sha1.c,v 1.13 2004/05/07 00:24:57 tgl Exp $ */
1+
/*$PostgreSQL: pgsql/contrib/pgcrypto/sha1.c,v 1.14 2004/08/29 16:43:05 tgl Exp $ */
22
/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
33

44
/*
@@ -102,7 +102,7 @@ sha1_step(struct sha1_ctxt * ctxt)
102102
#ifBYTE_ORDER==LITTLE_ENDIAN
103103
structsha1_ctxttctxt;
104104

105-
bcopy(&ctxt->m.b8[0],&tctxt.m.b8[0],64);
105+
memmove(&tctxt.m.b8[0],&ctxt->m.b8[0],64);
106106
ctxt->m.b8[0]=tctxt.m.b8[3];
107107
ctxt->m.b8[1]=tctxt.m.b8[2];
108108
ctxt->m.b8[2]=tctxt.m.b8[1];
@@ -304,7 +304,7 @@ sha1_loop(struct sha1_ctxt * ctxt, const uint8 *input0, size_t len)
304304
gaplen=64-gapstart;
305305

306306
copysiz= (gaplen<len-off) ?gaplen :len-off;
307-
bcopy(&input[off],&ctxt->m.b8[gapstart],copysiz);
307+
memmove(&ctxt->m.b8[gapstart],&input[off],copysiz);
308308
COUNT+=copysiz;
309309
COUNT %=64;
310310
ctxt->c.b64[0]+=copysiz*8;
@@ -322,7 +322,7 @@ sha1_result(struct sha1_ctxt * ctxt, uint8 *digest0)
322322
digest= (uint8*)digest0;
323323
sha1_pad(ctxt);
324324
#ifBYTE_ORDER==BIG_ENDIAN
325-
bcopy(&ctxt->h.b8[0],digest,20);
325+
memmove(digest,&ctxt->h.b8[0],20);
326326
#else
327327
digest[0]=ctxt->h.b8[3];
328328
digest[1]=ctxt->h.b8[2];

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp