generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove struct ccs_header_st

Browse Source 
struct ccs_header_st is not used so it should be removed.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2015-05-29 16:14:02 +01:00
parent 2d4deb256f
commit 6218a1f57e
3 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/d1_both.c
View File

@ -1298,13 +1298,6 @@ dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr)
n2l3(data, msg_hdr->frag_len); n2l3(data, msg_hdr->frag_len);
} }
void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr)
{
memset(ccs_hdr, 0, sizeof(*ccs_hdr));
ccs_hdr->type = *(data++);
}
int dtls1_shutdown(SSL *s) int dtls1_shutdown(SSL *s)
{ {
int ret; int ret;

3
ssl/record/rec_layer_d1.c
View File

@ -857,11 +857,8 @@ int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek)
} }
if (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC) { if (SSL3_RECORD_get_type(rr) == SSL3_RT_CHANGE_CIPHER_SPEC) {
struct ccs_header_st ccs_hdr;
unsigned int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH; unsigned int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
dtls1_get_ccs_header(SSL3_RECORD_get_data(rr), &ccs_hdr);
if (s->version == DTLS1_BAD_VER) if (s->version == DTLS1_BAD_VER)
ccs_hdr_len = 3; ccs_hdr_len = 3;

6
ssl/ssl_locl.h
View File

@ -1370,11 +1370,6 @@ struct hm_header_st {
struct dtls1_retransmit_state saved_retransmit_state; struct dtls1_retransmit_state saved_retransmit_state;
}; };
struct ccs_header_st {
unsigned char type;
unsigned short seq;
};
struct dtls1_timeout_st { struct dtls1_timeout_st {
/* Number of read timeouts so far */ /* Number of read timeouts so far */
unsigned int read_timeouts; unsigned int read_timeouts;
@ -1986,7 +1981,6 @@ int dtls1_retransmit_buffered_messages(SSL *s);
void dtls1_clear_record_buffer(SSL *s); void dtls1_clear_record_buffer(SSL *s);
void dtls1_get_message_header(unsigned char *data, void dtls1_get_message_header(unsigned char *data,
struct hm_header_st *msg_hdr); struct hm_header_st *msg_hdr);
void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr);
__owur long dtls1_default_timeout(void); __owur long dtls1_default_timeout(void);
__owur struct timeval *dtls1_get_timeout(SSL *s, struct timeval *timeleft); __owur struct timeval *dtls1_get_timeout(SSL *s, struct timeval *timeleft);
__owur int dtls1_check_timeout_num(SSL *s); __owur int dtls1_check_timeout_num(SSL *s);