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

Move ssl3_pending into the record layer 



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

ssl/record/rec_layer.h

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ void RECORD_LAYER_release(RECORD_LAYER *rl); 
int RECORD_LAYER_read_pending(RECORD_LAYER *rl);

int RECORD_LAYER_write_pending(RECORD_LAYER *rl);

int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len);

__owur int ssl3_pending(const SSL *s);

__owur int ssl23_read_bytes(SSL *s, int n);

__owur int ssl23_write_bytes(SSL *s);

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

ssl/record/s3_pkt.c

+9 −0
Original line number Diff line number Diff line
@@ -201,6 +201,15 @@ int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len) 
    return 1;

}



int ssl3_pending(const SSL *s)

{

    if (s->rstate == SSL_ST_READ_BODY)

        return 0;



    return (SSL3_RECORD_get_type(&s->rlayer.rrec) == SSL3_RT_APPLICATION_DATA)

           ? SSL3_RECORD_get_length(&s->rlayer.rrec) : 0;

}



int ssl3_read_n(SSL *s, int n, int max, int extend)

{

    /*

ssl/s3_lib.c

+0 −10
Original line number Diff line number Diff line
@@ -3078,16 +3078,6 @@ const SSL_CIPHER *ssl3_get_cipher(unsigned int u) 
        return (NULL);

}



int ssl3_pending(const SSL *s)

{

    if (s->rstate == SSL_ST_READ_BODY)

        return 0;



    return (SSL3_RECORD_get_type(RECORD_LAYER_get_rrec(&s->rlayer))

           == SSL3_RT_APPLICATION_DATA)

           ? SSL3_RECORD_get_length(RECORD_LAYER_get_rrec(&s->rlayer)) : 0;

}



int ssl3_set_handshake_header(SSL *s, int htype, unsigned long len)

{

    unsigned char *p = (unsigned char *)s->init_buf->data;

ssl/ssl_locl.h

+0 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,6 @@ __owur long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg); 
__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));

__owur int ssl3_pending(const SSL *s);



void ssl3_record_sequence_update(unsigned char *seq);

__owur int ssl3_do_change_cipher_spec(SSL *ssl);