summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-05-29 16:14:02 +0100
committerMatt Caswell <matt@openssl.org>2015-05-29 16:24:42 +0100
commit6218a1f57e7e25a6b9a798f00cf5f0e56a02ff31 (patch)
treed7833c994976abc7dd88d6752591a2be8433e02d
parent2d4deb256fb28f53ae778f8cf26698f49c5b83b4 (diff)
Remove struct ccs_header_st
struct ccs_header_st is not used so it should be removed. Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--ssl/d1_both.c7
-rw-r--r--ssl/record/rec_layer_d1.c3
-rw-r--r--ssl/ssl_locl.h6
3 files changed, 0 insertions, 16 deletions
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 05b8f9e08a..bcdba74819 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1298,13 +1298,6 @@ dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr)
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 ret;
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 159c222e61..52ef8f0834 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -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) {
- struct ccs_header_st ccs_hdr;
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)
ccs_hdr_len = 3;
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index bdc4d8c67d..9d1f80ab8f 100644
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -1370,11 +1370,6 @@ struct hm_header_st {
struct dtls1_retransmit_state saved_retransmit_state;
};
-struct ccs_header_st {
- unsigned char type;
- unsigned short seq;
-};
-
struct dtls1_timeout_st {
/* Number of read timeouts so far */
unsigned int read_timeouts;
@@ -1986,7 +1981,6 @@ int dtls1_retransmit_buffered_messages(SSL *s);
void dtls1_clear_record_buffer(SSL *s);
void dtls1_get_message_header(unsigned char *data,
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 struct timeval *dtls1_get_timeout(SSL *s, struct timeval *timeleft);
__owur int dtls1_check_timeout_num(SSL *s);