diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 14:14:24 +0000 |
| commit | 4284aeba874b9168f2228c59639bec8346a56796 (patch) | |
| tree | d51ffb4507e0cae24b0875d8bb6b2c037829a684 /openssl/ssl/s3_pkt.c | |
| parent | c438f190eedc71ee8dd14e14fec660e98d3dc0bf (diff) | |
| parent | 0695dfb71ca6fe132d15a4d0890e8a868183adf9 (diff) | |
| download | vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.gz vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.tar.bz2 vcxsrv-4284aeba874b9168f2228c59639bec8346a56796.zip | |
svn merge ^/branches/released
Diffstat (limited to 'openssl/ssl/s3_pkt.c')
| -rw-r--r-- | openssl/ssl/s3_pkt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openssl/ssl/s3_pkt.c b/openssl/ssl/s3_pkt.c index 9476dcddf..b98b84044 100644 --- a/openssl/ssl/s3_pkt.c +++ b/openssl/ssl/s3_pkt.c @@ -985,6 +985,7 @@ start: if (SSL_is_init_finished(s) && !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && + (s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION) && !s->s3->renegotiate) { ssl3_renegotiate(s); @@ -1117,7 +1118,8 @@ start: if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) + !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && + (s->s3->flags & SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION)) { #if 0 /* worked only because C operator preferences are not as expected (and * because this is not really needed for clients except for detecting |