summaryrefslogtreecommitdiffstats
path: root/ssl/s3_pkt.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-05-11 13:32:26 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-05-11 13:32:26 +0000
commit6e164e5c3d245c92a3793e292ad00c8e14dd7992 (patch)
tree3548caf4aaca35b0f9e6ccb36d9e8677f89ac11f /ssl/s3_pkt.c
parent1b452133ae89e27248cc2b8801290f4742e5cedc (diff)
PR: 2811
Reported by: Phil Pennock <openssl-dev@spodhuis.org> Make renegotiation work for TLS 1.2, 1.1 by not using a lower record version client hello workaround if renegotiating.
Diffstat (limited to 'ssl/s3_pkt.c')
-rw-r--r--ssl/s3_pkt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index adf8c387cc..f71c03b58d 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -744,6 +744,7 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
* bytes and record version number > TLS 1.0
*/
if (s->state == SSL3_ST_CW_CLNT_HELLO_B
+ && !s->renegotiate
&& TLS1_get_version(s) > TLS1_VERSION)
*(p++) = 0x1;
else