[openssl] master update

[tomas]

The branch master has been updated
       via  f16e52b67c9261bdc7e1284a50502a802921ac6d (commit)
      from  5e128ed1209335fb72fe50a68640331e354cbea6 (commit)


- Log -----------------------------------------------------------------
commit f16e52b67c9261bdc7e1284a50502a802921ac6d
Author: John Baldwin <j...@freebsd.org>
Date:   Fri Jan 29 10:34:49 2021 -0800

    Correct the return value of BIO_get_ktls_*().
    
    BIO_get_ktls_send() and BIO_get_ktls_recv() are documented as
    returning either 0 or 1.  However, they were actually returning the
    internal value of the associated BIO flag for the true case instead of
    1.
    
    Also trim redundant ternary operators.
    
    Reviewed-by: Shane Lontis <shane.lon...@oracle.com>
    Reviewed-by: Tomas Mraz <to...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14023)

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

Summary of changes:
 crypto/bio/bss_conn.c | 6 +++---
 crypto/bio/bss_fd.c   | 2 +-
 crypto/bio/bss_sock.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index c7bd0a329f..5b0a69486b 100644
--- a/crypto/bio/bss_conn.c
+++ b/crypto/bio/bss_conn.c
@@ -536,7 +536,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
         }
         break;
     case BIO_CTRL_EOF:
-        ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
+        ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
         break;
 # ifndef OPENSSL_NO_KTLS
     case BIO_CTRL_SET_KTLS:
@@ -546,9 +546,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
             BIO_set_ktls_flag(b, num);
         break;
     case BIO_CTRL_GET_KTLS_SEND:
-        return BIO_should_ktls_flag(b, 1);
+        return BIO_should_ktls_flag(b, 1) != 0;
     case BIO_CTRL_GET_KTLS_RECV:
-        return BIO_should_ktls_flag(b, 0);
+        return BIO_should_ktls_flag(b, 0) != 0;
     case BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG:
         BIO_set_ktls_ctrl_msg_flag(b);
         data->record_type = num;
diff --git a/crypto/bio/bss_fd.c b/crypto/bio/bss_fd.c
index e1cb62d80c..f0498a0969 100644
--- a/crypto/bio/bss_fd.c
+++ b/crypto/bio/bss_fd.c
@@ -189,7 +189,7 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
         ret = 1;
         break;
     case BIO_CTRL_EOF:
-        ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
+        ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
         break;
     default:
         ret = 0;
diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index d3eaa6b19e..11a020d8dc 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -191,9 +191,9 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
             BIO_set_ktls_flag(b, num);
         break;
     case BIO_CTRL_GET_KTLS_SEND:
-        return BIO_should_ktls_flag(b, 1);
+        return BIO_should_ktls_flag(b, 1) != 0;
     case BIO_CTRL_GET_KTLS_RECV:
-        return BIO_should_ktls_flag(b, 0);
+        return BIO_should_ktls_flag(b, 0) != 0;
     case BIO_CTRL_SET_KTLS_TX_SEND_CTRL_MSG:
         BIO_set_ktls_ctrl_msg_flag(b);
         b->ptr = (void *)num;
@@ -205,7 +205,7 @@ static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
         break;
 # endif
     case BIO_CTRL_EOF:
-        ret = (b->flags & BIO_FLAGS_IN_EOF) != 0 ? 1 : 0;
+        ret = (b->flags & BIO_FLAGS_IN_EOF) != 0;
         break;
     default:
         ret = 0;