[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  e7653f3bab1d44b4dad65637982e72a15ede0a49 (commit)
      from  5ec84dd75f7965942a55ef5382aa34b8417336c5 (commit)


- Log -----------------------------------------------------------------
commit e7653f3bab1d44b4dad65637982e72a15ede0a49
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jun 14 10:41:00 2016 +0100

    Fix comment
    
    Fix a comment following commit c2c49969e23605.
    
    RT2388
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 ssl/t1_lib.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 20d6787..9250283 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -2521,8 +2521,7 @@ static int ssl_scan_serverhello_tlsext(SSL *s, PACKET *pkt, int *al)
      * an attack we should *always* see RI even on initial server hello
      * because the client doesn't see any renegotiation during an attack.
      * However this would mean we could not connect to any server which
-     * doesn't support RI so for the immediate future tolerate RI absence on
-     * initial connect only.
+     * doesn't support RI so for the immediate future tolerate RI absence
      */
     if (!renegotiate_seen && !(s->options & SSL_OP_LEGACY_SERVER_CONNECT)
         && !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {