generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove RECORD_LAYER_set_ssl and introduce RECORD_LAYER_init

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-02-02 13:57:12 +00:00
parent bbcd6d7fe2
commit c036e210f3
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/record/rec_layer.h
View File

@ -158,7 +158,6 @@ typedef struct record_layer_st {
* * * *
*****************************************************************************/ *****************************************************************************/
#define RECORD_LAYER_set_ssl(rl, s) ((rl)->s = (s))
#define RECORD_LAYER_set_read_ahead(rl, ra) ((rl)->read_ahead = (ra)) #define RECORD_LAYER_set_read_ahead(rl, ra) ((rl)->read_ahead = (ra))
#define RECORD_LAYER_get_read_ahead(rl) ((rl)->read_ahead) #define RECORD_LAYER_get_read_ahead(rl) ((rl)->read_ahead)
#define RECORD_LAYER_get_rbuf(rl) (&(rl)->rbuf) #define RECORD_LAYER_get_rbuf(rl) (&(rl)->rbuf)
@ -166,6 +165,7 @@ typedef struct record_layer_st {
#define RECORD_LAYER_get_rrec(rl) (&(rl)->rrec) #define RECORD_LAYER_get_rrec(rl) (&(rl)->rrec)
#define RECORD_LAYER_get_wrec(rl) (&(rl)->wrec) #define RECORD_LAYER_get_wrec(rl) (&(rl)->wrec)
void RECORD_LAYER_init(RECORD_LAYER *rl, SSL *s);
void RECORD_LAYER_clear(RECORD_LAYER *rl); void RECORD_LAYER_clear(RECORD_LAYER *rl);
void RECORD_LAYER_release(RECORD_LAYER *rl); void RECORD_LAYER_release(RECORD_LAYER *rl);
int RECORD_LAYER_read_pending(RECORD_LAYER *rl); int RECORD_LAYER_read_pending(RECORD_LAYER *rl);

7
ssl/record/s3_pkt.c
View File

@ -132,6 +132,13 @@
# define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0 # define EVP_CIPH_FLAG_TLS1_1_MULTIBLOCK 0
#endif #endif
void RECORD_LAYER_init(RECORD_LAYER *rl, SSL *s)
{
rl->s = s;
SSL3_RECORD_clear(&rl->rrec);
SSL3_RECORD_clear(&rl->wrec);
}
void RECORD_LAYER_clear(RECORD_LAYER *rl) void RECORD_LAYER_clear(RECORD_LAYER *rl)
{ {
unsigned char *rp, *wp; unsigned char *rp, *wp;

4
ssl/ssl_lib.c
View File

@ -282,9 +282,7 @@ SSL *SSL_new(SSL_CTX *ctx)
goto err; goto err;
memset(s, 0, sizeof(SSL)); memset(s, 0, sizeof(SSL));
RECORD_LAYER_set_ssl(&s->rlayer, s); RECORD_LAYER_init(&s->rlayer, s);
SSL3_RECORD_clear(RECORD_LAYER_get_rrec(&s->rlayer));
SSL3_RECORD_clear(RECORD_LAYER_get_wrec(&s->rlayer));
#ifndef OPENSSL_NO_KRB5 #ifndef OPENSSL_NO_KRB5
s->kssl_ctx = kssl_ctx_new(); s->kssl_ctx = kssl_ctx_new();