kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ccs_header_st.

Browse Source 
It doesn't do anything.

Change-Id: I0bba4e22a0b2053aae491d0ad695c892803cafca
Reviewed-on: https://boringssl-review.googlesource.com/3767
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-03-02 21:09:31 -05:00 committed by Adam Langley
parent ee562b987e
commit f7f0f3a74b
4 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/openssl/dtls1.h
View File

@ -105,11 +105,6 @@ struct hm_header_st {
uint16_t epoch;
};
struct ccs_header_st {
uint8_t type;
uint16_t seq;
};
typedef struct record_pqueue_st {
uint16_t epoch;
pqueue q;

6
ssl/d1_both.c
View File

@ -924,12 +924,6 @@ void dtls1_get_message_header(uint8_t *data,
n2l3(data, msg_hdr->frag_len);
}
void dtls1_get_ccs_header(uint8_t *data, struct ccs_header_st *ccs_hdr) {
memset(ccs_hdr, 0x00, sizeof(struct ccs_header_st));
ccs_hdr->type = *(data++);
}
int dtls1_shutdown(SSL *s) {
int ret;
ret = ssl3_shutdown(s);

13
ssl/d1_pkt.c
View File

@ -786,16 +786,9 @@ start:
}
if (rr->type == SSL3_RT_CHANGE_CIPHER_SPEC) {
struct ccs_header_st ccs_hdr;
unsigned int ccs_hdr_len = DTLS1_CCS_HEADER_LENGTH;
dtls1_get_ccs_header(rr->data, &ccs_hdr);
/* 'Change Cipher Spec' is just a single byte, so we know
* exactly what the record payload has to look like */
/* XDTLS: check that epoch is consistent */
if ((rr->length != ccs_hdr_len) || (rr->off != 0) ||
(rr->data[0] != SSL3_MT_CCS)) {
/* 'Change Cipher Spec' is just a single byte, so we know exactly what the
* record payload has to look like */
if (rr->length != 1 || rr->off != 0 || rr->data[0] != SSL3_MT_CCS) {
al = SSL_AD_ILLEGAL_PARAMETER;
OPENSSL_PUT_ERROR(SSL, dtls1_read_bytes, SSL_R_BAD_CHANGE_CIPHER_SPEC);
goto f_err;

1
ssl/ssl_locl.h
View File

@ -815,7 +815,6 @@ int dtls1_get_queue_priority(unsigned short seq, int is_ccs);
int dtls1_retransmit_buffered_messages(SSL *s);
void dtls1_clear_record_buffer(SSL *s);
void dtls1_get_message_header(uint8_t *data, struct hm_header_st *msg_hdr);
void dtls1_get_ccs_header(uint8_t *data, struct ccs_header_st *ccs_hdr);
void dtls1_reset_seq_numbers(SSL *s, int rw);
int dtls1_check_timeout_num(SSL *s);
int dtls1_handle_timeout(SSL *s);