[openssl] OpenSSL_1_1_1-stable update

kaduk at mit.edu kaduk at mit.edu
Wed Dec 2 23:54:54 UTC 2020


The branch OpenSSL_1_1_1-stable has been updated
       via  9d5580612887b0c37016e7b65707e8e9dc27f4bb (commit)
      from  924c4f942108cc05d97fe03a70ce0ef0a00c4e45 (commit)


- Log -----------------------------------------------------------------
commit 9d5580612887b0c37016e7b65707e8e9dc27f4bb
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)
    
    (cherry picked from commit 70cae332a2c200087605f94cdccfee80c9380fbf)

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

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 73ca8a6ee4..7e22270485 100644
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -808,8 +808,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, SSL_F_DO_DTLS1_WRITE,


More information about the openssl-commits mailing list