Commit df15c849 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove some dead code from libssl 



There are a small number of functions in libssl that are internal only
and never used by anything.

Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2770)
parent 9d70ac97

ssl/record/rec_layer_d1.c

+0 −5
Original line number Diff line number Diff line
@@ -109,11 +109,6 @@ void DTLS_RECORD_LAYER_set_saved_w_epoch(RECORD_LAYER *rl, unsigned short e) 
    rl->d->w_epoch = e;

}



void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl)

{

    memcpy(rl->write_sequence, rl->read_sequence, sizeof(rl->write_sequence));

}



void DTLS_RECORD_LAYER_set_write_sequence(RECORD_LAYER *rl, unsigned char *seq)

{

    memcpy(rl->write_sequence, seq, SEQ_NUM_SIZE);

ssl/record/rec_layer_s3.c

+0 −17
Original line number Diff line number Diff line
@@ -88,23 +88,6 @@ int RECORD_LAYER_write_pending(const RECORD_LAYER *rl) 
        && SSL3_BUFFER_get_left(&rl->wbuf[rl->numwpipes - 1]) != 0;

}



int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf,

                          size_t len)

{

    rl->packet_length = len;

    if (len != 0) {

        rl->rstate = SSL_ST_READ_HEADER;

        if (!SSL3_BUFFER_is_initialised(&rl->rbuf))

            if (!ssl3_setup_read_buffer(rl->s))

                return 0;

    }



    rl->packet = SSL3_BUFFER_get_buf(&rl->rbuf);

    SSL3_BUFFER_set_data(&rl->rbuf, buf, len);



    return 1;

}



void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl)

{

    memset(rl->read_sequence, 0, sizeof(rl->read_sequence));

ssl/record/record.h

+0 −3
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl); 
void RECORD_LAYER_release(RECORD_LAYER *rl);

int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);

int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);

int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf,

                          size_t len);

void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);

void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);

int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
@@ -236,7 +234,6 @@ void DTLS_RECORD_LAYER_free(RECORD_LAYER *rl); 
void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);

void DTLS_RECORD_LAYER_set_saved_w_epoch(RECORD_LAYER *rl, unsigned short e);

void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);

void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl);

void DTLS_RECORD_LAYER_set_write_sequence(RECORD_LAYER *rl, unsigned char *seq);

__owur int dtls1_read_bytes(SSL *s, int type, int *recvd_type,

                            unsigned char *buf, size_t len, int peek,

ssl/ssl_lib.c

+0 −5
Original line number Diff line number Diff line
@@ -3612,11 +3612,6 @@ void *SSL_CTX_get_ex_data(const SSL_CTX *s, int idx) 
    return (CRYPTO_get_ex_data(&s->ex_data, idx));

}



int ssl_ok(SSL *s)

{

    return (1);

}



X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *ctx)

{

    return (ctx->cert_store);

ssl/ssl_locl.h

+0 −1
Original line number Diff line number Diff line
@@ -2210,7 +2210,6 @@ __owur int tls1_export_keying_material(SSL *s, unsigned char *out, size_t olen, 
__owur int tls1_alert_code(int code);

__owur int tls13_alert_code(int code);

__owur int ssl3_alert_code(int code);

__owur int ssl_ok(SSL *s);



#  ifndef OPENSSL_NO_EC

__owur int ssl_check_srvr_ecc_cert_and_alg(X509 *x, SSL *s);