Fix broken build

[openssl.git] / ssl / s3_both.c

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index 0a259b1f4f6cbbace47c844b0428a1157fe0e15e..b110e3c361021c44008d09e2299c6e6e33f069b9 100644 (file)
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -358,6 +358,7 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
                        goto f_err;
                        }
                *ok=1;
+               s->state = stn;
                s->init_msg = s->init_buf->data + 4;
                s->init_num = (int)s->s3->tmp.message_size;
                return s->init_num;
@@ -695,7 +696,7 @@ int ssl3_setup_read_buffer(SSL *s)
                        len += SSL3_RT_MAX_EXTRA;
                        }
 #ifndef OPENSSL_NO_COMP
-               if (!(s->options & SSL_OP_NO_COMPRESSION))
+               if (ssl_allow_compression(s))
                        len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
 #endif
                if ((p=freelist_extract(s->ctx, 1, len)) == NULL)
@@ -732,7 +733,7 @@ int ssl3_setup_write_buffer(SSL *s)
                        + SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD
                        + headerlen + align;
 #ifndef OPENSSL_NO_COMP
-               if (!(s->options & SSL_OP_NO_COMPRESSION))
+               if (ssl_allow_compression(s))
                        len += SSL3_RT_MAX_COMPRESSED_OVERHEAD;
 #endif
                if (!(s->options & SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS))
@@ -782,3 +783,10 @@ int ssl3_release_read_buffer(SSL *s)
        return 1;
        }
 
+int ssl_allow_compression(SSL *s)
+       {
+       if (s->options & SSL_OP_NO_COMPRESSION)
+               return 0;
+       return ssl_security(s, SSL_SECOP_COMPRESSION, 0, 0, NULL);
+       }
+