@@ -210,7 +210,7 @@ pktreader_free(void *priv)
210
210
{
211
211
struct PktData * pkt = priv ;
212
212
213
- memset (pkt , 0 , sizeof (* pkt ));
213
+ px_memset (pkt , 0 , sizeof (* pkt ));
214
214
px_free (pkt );
215
215
}
216
216
@@ -257,7 +257,7 @@ prefix_init(void **priv_p, void *arg, PullFilter *src)
257
257
if (res != len + 2 )
258
258
{
259
259
px_debug ("prefix_init: short read" );
260
- memset (tmpbuf , 0 , sizeof (tmpbuf ));
260
+ px_memset (tmpbuf , 0 , sizeof (tmpbuf ));
261
261
return PXE_PGP_CORRUPT_DATA ;
262
262
}
263
263
@@ -280,7 +280,7 @@ prefix_init(void **priv_p, void *arg, PullFilter *src)
280
280
*/
281
281
ctx -> corrupt_prefix = 1 ;
282
282
}
283
- memset (tmpbuf , 0 , sizeof (tmpbuf ));
283
+ px_memset (tmpbuf , 0 , sizeof (tmpbuf ));
284
284
return 0 ;
285
285
}
286
286
@@ -395,8 +395,8 @@ mdc_finish(PGP_Context *ctx, PullFilter *src,
395
395
*/
396
396
px_md_finish (ctx -> mdc_ctx , hash );
397
397
res = memcmp (hash , * data_p , 20 );
398
- memset (hash , 0 , 20 );
399
- memset (tmpbuf , 0 , sizeof (tmpbuf ));
398
+ px_memset (hash , 0 , 20 );
399
+ px_memset (tmpbuf , 0 , sizeof (tmpbuf ));
400
400
if (res != 0 )
401
401
{
402
402
px_debug ("mdc_finish: mdc failed" );
@@ -493,7 +493,7 @@ mdcbuf_finish(struct MDCBufData * st)
493
493
px_md_update (st -> ctx -> mdc_ctx , st -> mdc_buf , 2 );
494
494
px_md_finish (st -> ctx -> mdc_ctx , hash );
495
495
res = memcmp (hash , st -> mdc_buf + 2 , 20 );
496
- memset (hash , 0 , 20 );
496
+ px_memset (hash , 0 , 20 );
497
497
if (res )
498
498
{
499
499
px_debug ("mdcbuf_finish: MDC does not match" );
@@ -593,7 +593,7 @@ mdcbuf_free(void *priv)
593
593
594
594
px_md_free (st -> ctx -> mdc_ctx );
595
595
st -> ctx -> mdc_ctx = NULL ;
596
- memset (st , 0 , sizeof (* st ));
596
+ px_memset (st , 0 , sizeof (* st ));
597
597
px_free (st );
598
598
}
599
599
@@ -703,7 +703,7 @@ parse_symenc_sesskey(PGP_Context *ctx, PullFilter *src)
703
703
res = decrypt_key (ctx , p , res );
704
704
}
705
705
706
- memset (tmpbuf , 0 , sizeof (tmpbuf ));
706
+ px_memset (tmpbuf , 0 , sizeof (tmpbuf ));
707
707
return res ;
708
708
}
709
709
@@ -753,6 +753,7 @@ copy_crlf(MBuf *dst, uint8 *data, int len, int *got_cr)
753
753
if (res < 0 )
754
754
return res ;
755
755
}
756
+ px_memset (tmpbuf , 0 , sizeof (tmpbuf ));
756
757
return 0 ;
757
758
}
758
759
@@ -792,7 +793,7 @@ parse_literal_data(PGP_Context *ctx, MBuf *dst, PullFilter *pkt)
792
793
px_debug ("parse_literal_data: unexpected eof" );
793
794
return PXE_PGP_CORRUPT_DATA ;
794
795
}
795
- memset (tmpbuf , 0 , 4 );
796
+ px_memset (tmpbuf , 0 , 4 );
796
797
797
798
/* check if text */
798
799
if (ctx -> text_mode )
0 commit comments