[openssl-commits] [openssl] master update

[Kurt Roeckx]

The branch master has been updated
       via  dffdcc773ac0a294b1ce620131cb8d7401da9408 (commit)
      from  418bb7b31bb7cfca6e419a5aa7bf161784f61059 (commit)


- Log -----------------------------------------------------------------
commit dffdcc773ac0a294b1ce620131cb8d7401da9408
Author: Todd Short <tshort at akamai.com>
Date:   Mon May 22 11:24:59 2017 -0400

    Fix inconsistent check of UNSAFE_LEGACY_RENEGOTIATION
    
    The check for SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION is
    inconsistent. Most places check SSL->options, one place is checking
    SSL_CTX->options; fix that.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    GH: #3523

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

Summary of changes:
 ssl/record/rec_layer_s3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c
index fbabdf4..01caf4c 100644
--- a/ssl/record/rec_layer_s3.c
+++ b/ssl/record/rec_layer_s3.c
@@ -1439,7 +1439,7 @@ int ssl3_read_bytes(SSL *s, int type, int *recvd_type, unsigned char *buf,
         (s->rlayer.handshake_fragment_len >= 4) &&
         (s->rlayer.handshake_fragment[0] == SSL3_MT_CLIENT_HELLO) &&
         (s->session != NULL) && (s->session->cipher != NULL) &&
-        !(s->ctx->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
+        !(s->options & SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) {
         SSL3_RECORD_set_length(rr, 0);
         SSL3_RECORD_set_read(rr);
         ssl3_send_alert(s, SSL3_AL_WARNING, SSL_AD_NO_RENEGOTIATION);