Split out non record layer functions out of s3_pkt.c and d1_pkt.c into

[openssl.git] / ssl / ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index cb3492a5e433fd7d122c13b4e1cf88964561f792..727f91305fbfd8608c1f7424c0b8a44176358131 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -189,8 +189,8 @@ SSL3_ENC_METHOD ssl3_undef_enc_method = {
 
 int SSL_clear(SSL *s)
 {
-    unsigned char *rp;
-    size_t rlen;
+    unsigned char *rp, *wp;
+    size_t rlen, wlen;
     int read_ahead;
 
     if (s->method == NULL) {
@@ -248,15 +248,20 @@ int SSL_clear(SSL *s)
     read_ahead = RECORD_LAYER_get_read_ahead(&s->rlayer);
     rp = SSL3_BUFFER_get_buf(RECORD_LAYER_get_rbuf(&s->rlayer));
     rlen = SSL3_BUFFER_get_len(RECORD_LAYER_get_rbuf(&s->rlayer));
+    wp = SSL3_BUFFER_get_buf(RECORD_LAYER_get_wbuf(&s->rlayer));
+    wlen = SSL3_BUFFER_get_len(RECORD_LAYER_get_wbuf(&s->rlayer));
     memset(&s->rlayer, 0, sizeof s->rlayer);
     SSL3_BUFFER_set_buf(RECORD_LAYER_get_rbuf(&s->rlayer), rp);
     SSL3_BUFFER_set_len(RECORD_LAYER_get_rbuf(&s->rlayer), rlen);
+    SSL3_BUFFER_set_buf(RECORD_LAYER_get_wbuf(&s->rlayer), wp);
+    SSL3_BUFFER_set_len(RECORD_LAYER_get_wbuf(&s->rlayer), wlen);
 
     /* Do I need to do this? As far as I can tell read_ahead did not
      * previously get reset by SSL_clear...so I'll keep it that way..but is
      * that right?
      */
     RECORD_LAYER_set_read_ahead(&s->rlayer, read_ahead);
+    RECORD_LAYER_set_ssl(&s->rlayer, s);
 
     return (1);
 }
@@ -298,6 +303,8 @@ SSL *SSL_new(SSL_CTX *ctx)
     memset(s, 0, sizeof(SSL));
 
     RECORD_LAYER_set_ssl(&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
     s->kssl_ctx = kssl_ctx_new();
@@ -618,6 +625,9 @@ void SSL_free(SSL *s)
 
     if (SSL3_BUFFER_is_initialised(RECORD_LAYER_get_rbuf(&s->rlayer)))
         ssl3_release_read_buffer(s);
+    if (SSL3_BUFFER_is_initialised(RECORD_LAYER_get_wbuf(&s->rlayer)))
+        ssl3_release_write_buffer(s);
+    SSL3_RECORD_release(RECORD_LAYER_get_rrec(&s->rlayer));
 
     if (s->ctx)
         SSL_CTX_free(s->ctx);