Commit 14daae5a authored by Matt Caswell's avatar Matt Caswell
Browse files

Move ssl3_record_sequence_update into record layer 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 24a1e2f2

ssl/record/rec_layer.h

+2 −2
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int DTLS_RECORD_LAYER_new(RECORD_LAYER *rl); 
void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl);

void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);

__owur int dtls1_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek);

int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);

__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);

__owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,

                   unsigned int len, int create_empty_fragement);

void dtls1_reset_seq_numbers(SSL *s, int rw);
@@ -292,4 +292,4 @@ 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);

ssl/record/s3_pkt.c

+11 −0
Original line number Diff line number Diff line
@@ -1445,4 +1445,15 @@ int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len, int peek) 
    return (-1);

}



void ssl3_record_sequence_update(unsigned char *seq)

{

    int i;



    for (i = 7; i >= 0; i--) {

        ++seq[i];

        if (seq[i] != 0)

            break;

    }

}

ssl/s3_enc.c

+0 −11
Original line number Diff line number Diff line
@@ -638,17 +638,6 @@ static int ssl3_handshake_mac(SSL *s, int md_nid, 
    return ((int)ret);

}



void ssl3_record_sequence_update(unsigned char *seq)

{

    int i;



    for (i = 7; i >= 0; i--) {

        ++seq[i];

        if (seq[i] != 0)

            break;

    }

}



int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p,

                                int len)

{

ssl/ssl_locl.h

+0 −2
Original line number Diff line number Diff line
@@ -2049,7 +2049,6 @@ __owur long ssl3_ctx_ctrl(SSL_CTX *s, int cmd, long larg, void *parg); 
__owur long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void));

__owur long ssl3_ctx_callback_ctrl(SSL_CTX *s, int cmd, void (*fp) (void));



void ssl3_record_sequence_update(unsigned char *seq);

__owur int ssl3_do_change_cipher_spec(SSL *ssl);

__owur long ssl3_default_timeout(void);
@@ -2076,7 +2075,6 @@ void dtls1_set_message_header(SSL *s, 
                              unsigned long frag_len);



__owur int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len);

__owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);



__owur int dtls1_send_change_cipher_spec(SSL *s, int a, int b);

__owur int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);