diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2020-10-03 17:11:29 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2020-10-03 17:11:29 +0000 |
| commit | 505e5b562d7e2dd7fa142630b014a65d8229699d (patch) | |
| tree | 1aece4cad166a7ec189ed0708af413ab379c2531 /lib | |
| parent | 59676421f7ea69f94e43f4066426c0673094a84a (diff) | |
Make dtls1_copy_record() take a DTLS1_RECORD_DATA_INTERNAL *.
This removes the need for extra variables and casts.
ok inoguchi@ tb@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/d1_pkt.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/libssl/d1_pkt.c b/lib/libssl/d1_pkt.c index f115e1a4787..859043a3cec 100644 --- a/lib/libssl/d1_pkt.c +++ b/lib/libssl/d1_pkt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_pkt.c,v 1.83 2020/10/03 17:10:09 jsing Exp $ */ +/* $OpenBSD: d1_pkt.c,v 1.84 2020/10/03 17:11:28 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -194,12 +194,8 @@ static int dtls1_process_record(SSL *s); /* copy buffered record into SSL structure */ static int -dtls1_copy_record(SSL *s, pitem *item) +dtls1_copy_record(SSL *s, DTLS1_RECORD_DATA_INTERNAL *rdata) { - DTLS1_RECORD_DATA_INTERNAL *rdata; - - rdata = (DTLS1_RECORD_DATA_INTERNAL *)item->data; - ssl3_release_buffer(&S3I(s)->rbuf); s->internal->packet = rdata->packet; @@ -213,7 +209,6 @@ dtls1_copy_record(SSL *s, pitem *item) return (1); } - static int dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) { @@ -268,7 +263,7 @@ dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue) item = pqueue_pop(queue->q); if (item) { - dtls1_copy_record(s, item); + dtls1_copy_record(s, item->data); free(item->data); pitem_free(item); @@ -675,8 +670,7 @@ dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) pitem *item; item = pqueue_pop(D1I(s)->buffered_app_data.q); if (item) { - - dtls1_copy_record(s, item); + dtls1_copy_record(s, item->data); free(item->data); pitem_free(item); |