[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  68423b146151a15c5373a24506506c588ae08729 (commit)
      from  b3bd3d5af8ed31f438db4367ce3a4bd43067e764 (commit)


- Log -----------------------------------------------------------------
commit 68423b146151a15c5373a24506506c588ae08729
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 28 17:39:26 2016 +0200

    Fix BIO_set_nbio_accept()
    
    The code that implements this control would work when enabling nbio,
    but the disabling code needed fixing.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/bio/bss_acpt.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index 8cd66fe..70168ec 100644
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -474,16 +474,17 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
                 data->param_serv = BUF_strdup(ptr);
                 b->init = 1;
             } else if (num == 2) {
-                if (ptr != NULL)
-                    data->bind_mode |= BIO_SOCK_NONBLOCK;
-                else
-                    data->bind_mode &= ~BIO_SOCK_NONBLOCK;
+                data->bind_mode |= BIO_SOCK_NONBLOCK;
             } else if (num == 3) {
                 BIO_free(data->bio_chain);
                 data->bio_chain = (BIO *)ptr;
             } else if (num == 4) {
                 data->accept_family = *(int *)ptr;
             }
+        } else {
+            if (num == 2) {
+                data->bind_mode &= ~BIO_SOCK_NONBLOCK;
+            }
         }
         break;
     case BIO_C_SET_NBIO: