summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2020-08-11 19:13:35 +0000
committerjsing <>2020-08-11 19:13:35 +0000
commit880ea195eca4d4670a18be746a2ed8af2fbae1bf (patch)
treef621cd525b3033a7f4d2330d4efec3466735da76
parente60447c161c889413e5e51194ef31bec0e405a19 (diff)
downloadopenbsd-880ea195eca4d4670a18be746a2ed8af2fbae1bf.tar.gz
openbsd-880ea195eca4d4670a18be746a2ed8af2fbae1bf.tar.bz2
openbsd-880ea195eca4d4670a18be746a2ed8af2fbae1bf.zip
Use 0 instead of 0x00 for memset() calls.
ok inoguchi@ tb@
-rw-r--r--src/lib/libssl/d1_both.c8
-rw-r--r--src/lib/libssl/d1_pkt.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/d1_both.c b/src/lib/libssl/d1_both.c
index 8f3cc610b8..4a2e41b21b 100644
--- a/src/lib/libssl/d1_both.c
+++ b/src/lib/libssl/d1_both.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_both.c,v 1.57 2019/02/10 16:42:35 phessler Exp $ */ 1/* $OpenBSD: d1_both.c,v 1.58 2020/08/11 19:13:35 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -417,7 +417,7 @@ dtls1_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
417 } 417 }
418 418
419 msg_hdr = &D1I(s)->r_msg_hdr; 419 msg_hdr = &D1I(s)->r_msg_hdr;
420 memset(msg_hdr, 0x00, sizeof(struct hm_header_st)); 420 memset(msg_hdr, 0, sizeof(struct hm_header_st));
421 421
422again: 422again:
423 i = dtls1_get_message_fragment(s, st1, stn, max, ok); 423 i = dtls1_get_message_fragment(s, st1, stn, max, ok);
@@ -441,7 +441,7 @@ again:
441 s->internal->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, p, msg_len, 441 s->internal->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, p, msg_len,
442 s, s->internal->msg_callback_arg); 442 s, s->internal->msg_callback_arg);
443 443
444 memset(msg_hdr, 0x00, sizeof(struct hm_header_st)); 444 memset(msg_hdr, 0, sizeof(struct hm_header_st));
445 445
446 /* Don't change sequence numbers while listening */ 446 /* Don't change sequence numbers while listening */
447 if (!D1I(s)->listen) 447 if (!D1I(s)->listen)
@@ -1249,7 +1249,7 @@ dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr)
1249void 1249void
1250dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr) 1250dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr)
1251{ 1251{
1252 memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st)); 1252 memset(ccs_hdr, 0, sizeof(struct ccs_header_st));
1253 1253
1254 ccs_hdr->type = *(data++); 1254 ccs_hdr->type = *(data++);
1255} 1255}
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c
index dd7d9aa76c..9ea694f605 100644
--- a/src/lib/libssl/d1_pkt.c
+++ b/src/lib/libssl/d1_pkt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: d1_pkt.c,v 1.78 2020/08/09 16:02:58 jsing Exp $ */ 1/* $OpenBSD: d1_pkt.c,v 1.79 2020/08/11 19:13:35 jsing Exp $ */
2/* 2/*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -1370,7 +1370,7 @@ dtls1_dispatch_alert(SSL *s)
1370 1370
1371 S3I(s)->alert_dispatch = 0; 1371 S3I(s)->alert_dispatch = 0;
1372 1372
1373 memset(buf, 0x00, sizeof(buf)); 1373 memset(buf, 0, sizeof(buf));
1374 *ptr++ = S3I(s)->send_alert[0]; 1374 *ptr++ = S3I(s)->send_alert[0];
1375 *ptr++ = S3I(s)->send_alert[1]; 1375 *ptr++ = S3I(s)->send_alert[1];
1376 1376
@@ -1430,12 +1430,12 @@ dtls1_reset_seq_numbers(SSL *s, int rw)
1430 seq = S3I(s)->read_sequence; 1430 seq = S3I(s)->read_sequence;
1431 D1I(s)->r_epoch++; 1431 D1I(s)->r_epoch++;
1432 memcpy(&(D1I(s)->bitmap), &(D1I(s)->next_bitmap), sizeof(DTLS1_BITMAP)); 1432 memcpy(&(D1I(s)->bitmap), &(D1I(s)->next_bitmap), sizeof(DTLS1_BITMAP));
1433 memset(&(D1I(s)->next_bitmap), 0x00, sizeof(DTLS1_BITMAP)); 1433 memset(&(D1I(s)->next_bitmap), 0, sizeof(DTLS1_BITMAP));
1434 } else { 1434 } else {
1435 seq = S3I(s)->write_sequence; 1435 seq = S3I(s)->write_sequence;
1436 memcpy(D1I(s)->last_write_sequence, seq, sizeof(S3I(s)->write_sequence)); 1436 memcpy(D1I(s)->last_write_sequence, seq, sizeof(S3I(s)->write_sequence));
1437 D1I(s)->w_epoch++; 1437 D1I(s)->w_epoch++;
1438 } 1438 }
1439 1439
1440 memset(seq, 0x00, seq_bytes); 1440 memset(seq, 0, seq_bytes);
1441} 1441}