[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  bfb155c187fbb1e56561614925be5ca4ef069f03 (commit)
      from  dbd5c34f18d9119cfdeca439eb7aac28117f53d4 (commit)


- Log -----------------------------------------------------------------
commit bfb155c187fbb1e56561614925be5ca4ef069f03
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 26 18:01:24 2016 +0100

    split_send_fragment should always be less than or equal to max_send_fragment
    
    A bug meant that SSL_CTRL_SET_MAX_SEND_FRAGMENT was not adjusting
    split_send_fragment properly.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_lib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 994d093..f93b98f 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1873,7 +1873,7 @@ long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             return 0;
         ctx->max_send_fragment = larg;
         if (ctx->max_send_fragment < ctx->split_send_fragment)
-            ctx->split_send_fragment = ctx->split_send_fragment;
+            ctx->split_send_fragment = ctx->max_send_fragment;
         return 1;
     case SSL_CTRL_SET_SPLIT_SEND_FRAGMENT:
         if ((unsigned int)larg > ctx->max_send_fragment || larg == 0)