diff options
Diffstat (limited to 'src/lib/libssl/d1_pkt.c')
-rw-r--r-- | src/lib/libssl/d1_pkt.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/d1_pkt.c b/src/lib/libssl/d1_pkt.c index cb5f2c3199..69f3d45734 100644 --- a/src/lib/libssl/d1_pkt.c +++ b/src/lib/libssl/d1_pkt.c | |||
@@ -200,7 +200,7 @@ dtls1_copy_record(SSL *s, pitem *item) | |||
200 | rdata = (DTLS1_RECORD_DATA *)item->data; | 200 | rdata = (DTLS1_RECORD_DATA *)item->data; |
201 | 201 | ||
202 | if (s->s3->rbuf.buf != NULL) | 202 | if (s->s3->rbuf.buf != NULL) |
203 | OPENSSL_free(s->s3->rbuf.buf); | 203 | free(s->s3->rbuf.buf); |
204 | 204 | ||
205 | s->packet = rdata->packet; | 205 | s->packet = rdata->packet; |
206 | s->packet_length = rdata->packet_length; | 206 | s->packet_length = rdata->packet_length; |
@@ -224,11 +224,11 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) | |||
224 | if (pqueue_size(queue->q) >= 100) | 224 | if (pqueue_size(queue->q) >= 100) |
225 | return 0; | 225 | return 0; |
226 | 226 | ||
227 | rdata = OPENSSL_malloc(sizeof(DTLS1_RECORD_DATA)); | 227 | rdata = malloc(sizeof(DTLS1_RECORD_DATA)); |
228 | item = pitem_new(priority, rdata); | 228 | item = pitem_new(priority, rdata); |
229 | if (rdata == NULL || item == NULL) { | 229 | if (rdata == NULL || item == NULL) { |
230 | if (rdata != NULL) | 230 | if (rdata != NULL) |
231 | OPENSSL_free(rdata); | 231 | free(rdata); |
232 | if (item != NULL) | 232 | if (item != NULL) |
233 | pitem_free(item); | 233 | pitem_free(item); |
234 | 234 | ||
@@ -253,7 +253,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) | |||
253 | 253 | ||
254 | /* insert should not fail, since duplicates are dropped */ | 254 | /* insert should not fail, since duplicates are dropped */ |
255 | if (pqueue_insert(queue->q, item) == NULL) { | 255 | if (pqueue_insert(queue->q, item) == NULL) { |
256 | OPENSSL_free(rdata); | 256 | free(rdata); |
257 | pitem_free(item); | 257 | pitem_free(item); |
258 | return (0); | 258 | return (0); |
259 | } | 259 | } |
@@ -265,7 +265,7 @@ dtls1_buffer_record(SSL *s, record_pqueue *queue, unsigned char *priority) | |||
265 | 265 | ||
266 | if (!ssl3_setup_buffers(s)) { | 266 | if (!ssl3_setup_buffers(s)) { |
267 | SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR); | 267 | SSLerr(SSL_F_DTLS1_BUFFER_RECORD, ERR_R_INTERNAL_ERROR); |
268 | OPENSSL_free(rdata); | 268 | free(rdata); |
269 | pitem_free(item); | 269 | pitem_free(item); |
270 | return (0); | 270 | return (0); |
271 | } | 271 | } |
@@ -283,7 +283,7 @@ dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue) | |||
283 | if (item) { | 283 | if (item) { |
284 | dtls1_copy_record(s, item); | 284 | dtls1_copy_record(s, item); |
285 | 285 | ||
286 | OPENSSL_free(item->data); | 286 | free(item->data); |
287 | pitem_free(item); | 287 | pitem_free(item); |
288 | 288 | ||
289 | return (1); | 289 | return (1); |
@@ -360,14 +360,14 @@ dtls1_get_buffered_record(SSL *s) | |||
360 | rdata = (DTLS1_RECORD_DATA *)item->data; | 360 | rdata = (DTLS1_RECORD_DATA *)item->data; |
361 | 361 | ||
362 | if (s->s3->rbuf.buf != NULL) | 362 | if (s->s3->rbuf.buf != NULL) |
363 | OPENSSL_free(s->s3->rbuf.buf); | 363 | free(s->s3->rbuf.buf); |
364 | 364 | ||
365 | s->packet = rdata->packet; | 365 | s->packet = rdata->packet; |
366 | s->packet_length = rdata->packet_length; | 366 | s->packet_length = rdata->packet_length; |
367 | memcpy(&(s->s3->rbuf), &(rdata->rbuf), sizeof(SSL3_BUFFER)); | 367 | memcpy(&(s->s3->rbuf), &(rdata->rbuf), sizeof(SSL3_BUFFER)); |
368 | memcpy(&(s->s3->rrec), &(rdata->rrec), sizeof(SSL3_RECORD)); | 368 | memcpy(&(s->s3->rrec), &(rdata->rrec), sizeof(SSL3_RECORD)); |
369 | 369 | ||
370 | OPENSSL_free(item->data); | 370 | free(item->data); |
371 | pitem_free(item); | 371 | pitem_free(item); |
372 | 372 | ||
373 | /* s->d1->next_expected_seq_num++; */ | 373 | /* s->d1->next_expected_seq_num++; */ |
@@ -810,7 +810,7 @@ start: | |||
810 | 810 | ||
811 | dtls1_copy_record(s, item); | 811 | dtls1_copy_record(s, item); |
812 | 812 | ||
813 | OPENSSL_free(item->data); | 813 | free(item->data); |
814 | pitem_free(item); | 814 | pitem_free(item); |
815 | } | 815 | } |
816 | } | 816 | } |