[openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  70cae332a2c200087605f94cdccfee80c9380fbf (commit)
      from  0a3b330cf09dd3746f4f9c5bb82d9bbcfff809c1 (commit)


- Log -----------------------------------------------------------------
commit 70cae332a2c200087605f94cdccfee80c9380fbf
Author: Benjamin Kaduk <bkaduk at akamai.com>
Date:   Sat Nov 28 17:11:46 2020 -0800

    Fix comment in do_dtls1_write()
    
    This code started off as a copy of ssl3_write_bytes(), and the comment
    was not updated with the implementation.
    
    Reported by yangyangtiantianlonglong in #13518
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13566)

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

Summary of changes:
 ssl/record/rec_layer_d1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index 53ac5eebbc..cc412bae37 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -800,8 +800,8 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     wb = &s->rlayer.wbuf[0];
 
     /*
-     * first check if there is a SSL3_BUFFER still being written out.  This
-     * will happen with non blocking IO
+     * DTLS writes whole datagrams, so there can't be anything left in
+     * the buffer.
      */
     if (!ossl_assert(SSL3_BUFFER_get_left(wb) == 0)) {
         SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);