255cfeacd8
Previously if we received an empty record we just threw it away and ignored it. Really though if we get an empty record of a different content type to what we are expecting then that should be an error, i.e. we should reject out of context empty records. This commit makes the necessary changes to achieve that. RT#4395 Reviewed-by: Andy Polyakov <appro@openssl.org>
113 lines
5.8 KiB
C
113 lines
5.8 KiB
C
/*
|
|
* Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL license (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
/*****************************************************************************
|
|
* *
|
|
* The following macros/functions are PRIVATE to the record layer. They *
|
|
* should NOT be used outside of the record layer. *
|
|
* *
|
|
*****************************************************************************/
|
|
|
|
/* Functions/macros provided by the RECORD_LAYER component */
|
|
|
|
#define RECORD_LAYER_get_rbuf(rl) (&(rl)->rbuf)
|
|
#define RECORD_LAYER_get_wbuf(rl) ((rl)->wbuf)
|
|
#define RECORD_LAYER_get_rrec(rl) ((rl)->rrec)
|
|
#define RECORD_LAYER_set_packet(rl, p) ((rl)->packet = (p))
|
|
#define RECORD_LAYER_reset_packet_length(rl) ((rl)->packet_length = 0)
|
|
#define RECORD_LAYER_get_rstate(rl) ((rl)->rstate)
|
|
#define RECORD_LAYER_set_rstate(rl, st) ((rl)->rstate = (st))
|
|
#define RECORD_LAYER_get_read_sequence(rl) ((rl)->read_sequence)
|
|
#define RECORD_LAYER_get_write_sequence(rl) ((rl)->write_sequence)
|
|
#define RECORD_LAYER_get_numrpipes(rl) ((rl)->numrpipes)
|
|
#define RECORD_LAYER_set_numrpipes(rl, n) ((rl)->numrpipes = (n))
|
|
#define RECORD_LAYER_inc_empty_record_count(rl) ((rl)->empty_record_count++)
|
|
#define RECORD_LAYER_reset_empty_record_count(rl) \
|
|
((rl)->empty_record_count = 0)
|
|
#define RECORD_LAYER_get_empty_record_count(rl) ((rl)->empty_record_count)
|
|
#define DTLS_RECORD_LAYER_get_r_epoch(rl) ((rl)->d->r_epoch)
|
|
|
|
__owur int ssl3_read_n(SSL *s, int n, int max, int extend, int clearold);
|
|
|
|
void RECORD_LAYER_set_write_sequence(RECORD_LAYER *rl, const unsigned char *ws);
|
|
DTLS1_BITMAP *dtls1_get_bitmap(SSL *s, SSL3_RECORD *rr,
|
|
unsigned int *is_next_epoch);
|
|
int dtls1_process_buffered_records(SSL *s);
|
|
int dtls1_retrieve_buffered_record(SSL *s, record_pqueue *queue);
|
|
int dtls1_buffer_record(SSL *s, record_pqueue *q,
|
|
unsigned char *priority);
|
|
void ssl3_record_sequence_update(unsigned char *seq);
|
|
|
|
/* Functions provided by the DTLS1_BITMAP component */
|
|
|
|
int dtls1_record_replay_check(SSL *s, DTLS1_BITMAP *bitmap);
|
|
void dtls1_record_bitmap_update(SSL *s, DTLS1_BITMAP *bitmap);
|
|
|
|
|
|
/* Macros/functions provided by the SSL3_BUFFER component */
|
|
|
|
#define SSL3_BUFFER_get_buf(b) ((b)->buf)
|
|
#define SSL3_BUFFER_set_buf(b, n) ((b)->buf = (n))
|
|
#define SSL3_BUFFER_get_len(b) ((b)->len)
|
|
#define SSL3_BUFFER_set_len(b, l) ((b)->len = (l))
|
|
#define SSL3_BUFFER_get_left(b) ((b)->left)
|
|
#define SSL3_BUFFER_set_left(b, l) ((b)->left = (l))
|
|
#define SSL3_BUFFER_add_left(b, l) ((b)->left += (l))
|
|
#define SSL3_BUFFER_get_offset(b) ((b)->offset)
|
|
#define SSL3_BUFFER_set_offset(b, o) ((b)->offset = (o))
|
|
#define SSL3_BUFFER_add_offset(b, o) ((b)->offset += (o))
|
|
#define SSL3_BUFFER_is_initialised(b) ((b)->buf != NULL)
|
|
#define SSL3_BUFFER_set_default_len(b, l) ((b)->default_len = (l))
|
|
|
|
void SSL3_BUFFER_clear(SSL3_BUFFER *b);
|
|
void SSL3_BUFFER_set_data(SSL3_BUFFER *b, const unsigned char *d, int n);
|
|
void SSL3_BUFFER_release(SSL3_BUFFER *b);
|
|
__owur int ssl3_setup_read_buffer(SSL *s);
|
|
__owur int ssl3_setup_write_buffer(SSL *s, unsigned int numwpipes);
|
|
int ssl3_release_read_buffer(SSL *s);
|
|
int ssl3_release_write_buffer(SSL *s);
|
|
|
|
/* Macros/functions provided by the SSL3_RECORD component */
|
|
|
|
#define SSL3_RECORD_get_type(r) ((r)->type)
|
|
#define SSL3_RECORD_set_type(r, t) ((r)->type = (t))
|
|
#define SSL3_RECORD_get_length(r) ((r)->length)
|
|
#define SSL3_RECORD_set_length(r, l) ((r)->length = (l))
|
|
#define SSL3_RECORD_add_length(r, l) ((r)->length += (l))
|
|
#define SSL3_RECORD_sub_length(r, l) ((r)->length -= (l))
|
|
#define SSL3_RECORD_get_data(r) ((r)->data)
|
|
#define SSL3_RECORD_set_data(r, d) ((r)->data = (d))
|
|
#define SSL3_RECORD_get_input(r) ((r)->input)
|
|
#define SSL3_RECORD_set_input(r, i) ((r)->input = (i))
|
|
#define SSL3_RECORD_reset_input(r) ((r)->input = (r)->data)
|
|
#define SSL3_RECORD_get_seq_num(r) ((r)->seq_num)
|
|
#define SSL3_RECORD_get_off(r) ((r)->off)
|
|
#define SSL3_RECORD_set_off(r, o) ((r)->off = (o))
|
|
#define SSL3_RECORD_add_off(r, o) ((r)->off += (o))
|
|
#define SSL3_RECORD_get_epoch(r) ((r)->epoch)
|
|
#define SSL3_RECORD_is_sslv2_record(r) \
|
|
((r)->rec_version == SSL2_VERSION)
|
|
#define SSL3_RECORD_is_read(r) ((r)->read)
|
|
#define SSL3_RECORD_set_read(r) ((r)->read = 1)
|
|
|
|
void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs);
|
|
void SSL3_RECORD_release(SSL3_RECORD *r, unsigned int num_recs);
|
|
void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num);
|
|
int ssl3_get_record(SSL *s);
|
|
__owur int ssl3_do_compress(SSL *ssl, SSL3_RECORD *wr);
|
|
__owur int ssl3_do_uncompress(SSL *ssl, SSL3_RECORD *rr);
|
|
void ssl3_cbc_copy_mac(unsigned char *out,
|
|
const SSL3_RECORD *rec, unsigned md_size);
|
|
__owur int ssl3_cbc_remove_padding(SSL3_RECORD *rec,
|
|
unsigned block_size, unsigned mac_size);
|
|
__owur int tls1_cbc_remove_padding(const SSL *s,
|
|
SSL3_RECORD *rec,
|
|
unsigned block_size, unsigned mac_size);
|
|
int dtls1_process_record(SSL *s);
|
|
__owur int dtls1_get_record(SSL *s);
|